@kici-dev/agent 0.1.16 → 0.1.18

package/dist/server.js

@@ -12,25 +12,27 @@ import winston from "winston";
 import { RingBuffer, addLogsToArchive, chunkBuffer, createHealthRoutes, createLogger, createMeter, createMetricsRoutes, deriveSharedSecret, getPrometheusExporter, getReconnectDelay, getRequestContext, guardStartup, initTelemetry, logger, normalizeLineEndings, redactConfig, requestContext, setServiceName, setupGracefulShutdown, sha256, sha256File, toErrorMessage, validateRequiredTools } from "@kici-dev/shared";
 import { z } from "zod";
 import { LOGGER_ENV_VARS, defineEnv, validateUnknownKiciVars } from "@kici-dev/shared/env";
-import { ALLOWED_SYSTEM_VARS, CacheRunEventType, CacheStepType, ExecutionJobStatus, ExecutionStepStatus, InitFailureCategory, KNOWN_ROLES, PROTOCOL_VERSION, SANDBOX_DEFAULT_VARS, WS_CLOSE_AGENT_AUTH_FAILED, WS_MAX_PAYLOAD_BYTES, deriveOsArchLabels, heartbeatSchema, hostLabel, mergeAutoLabels, orchestratorToAgentMessageSchema, resolveRoleLabels, validateNoReservedLabels } from "@kici-dev/engine";
+import { ALLOWED_SYSTEM_VARS, CacheRunEventType, CacheStepType, ExecutionJobStatus, ExecutionStepStatus, InitFailureCategory, KNOWN_ROLES, PROTOCOL_VERSION, SANDBOX_DEFAULT_VARS, WS_CLOSE_AGENT_AUTH_FAILED, WS_MAX_PAYLOAD_BYTES, applyIncludeExclude, deriveOsArchLabels, expandMatrix, heartbeatSchema, hostLabel, mergeAutoLabels, orchestratorToAgentMessageSchema, resolveRoleLabels, validateNoReservedLabels } from "@kici-dev/engine";
 import { execFile, execFileSync, execSync, fork, spawn } from "node:child_process";
 import WebSocket from "ws";
-import archiver from "archiver";
+import { ZipArchive } from "archiver";
+import fs, { existsSync } from "node:fs";
+import path, { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { format, promisify } from "node:util";
-import { existsSync } from "node:fs";
-import path, { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { gcStaleTmpDirs } from "@kici-dev/core/tmp-gc";
-import { fileURLToPath, pathToFileURL } from "node:url";
-import fs, { access, lstat, mkdir, mkdtemp, readFile, readdir, realpath, rm, unlink, writeFile } from "node:fs/promises";
+import fs$1, { access, lstat, mkdir, mkdtemp, readFile, readdir, realpath, rm, unlink, writeFile } from "node:fs/promises";
 import Docker from "dockerode";
-import { buildKiciApi, isDynamicGroupRef, isDynamicJobFn, isStaticArray, isStaticObject } from "@kici-dev/sdk";
+import { buildKiciApi, buildNeedsContext, isDynamicGroupRef, isDynamicJobFn, isStaticArray, isStaticObject } from "@kici-dev/sdk";
 import { c, x } from "tar";
 import https from "node:https";
 import http from "node:http";
 import { pipeline } from "node:stream/promises";
 import { createGunzip } from "node:zlib";
-import { PNPM_IGNORE_BUILD_GATE_ARG, PackageManager, detectPackageManagerFromManifests } from "@kici-dev/shared/package-manager";
+import { normalizeRunsOnToMatchers } from "@kici-dev/engine/labels/compile";
+import { PNPM_IGNORE_BUILD_GATE_ARG, PackageManager, YarnFlavor, detectPackageManagerFromManifests, detectYarnFlavor } from "@kici-dev/shared/package-manager";
+import { parse, stringify } from "yaml";
 import { createInterface } from "node:readline";
 var __defProp = Object.defineProperty;
 var __esmMin = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -189,7 +191,7 @@ function agentClientConnectionOptions(config) {
 * lean subset of the orchestrator's createDebugBundle.
 */
 async function buildAgentMiniBundle(opts) {
-	const archive = archiver("zip", { zlib: { level: 6 } });
+	const archive = new ZipArchive({ zlib: { level: 6 } });
 	const chunks = [];
 	archive.on("data", (d) => chunks.push(d));
 	const done = new Promise((resolve, reject) => {
@@ -219,6 +221,35 @@ async function buildAgentMiniBundle(opts) {
 	return Buffer.concat(chunks);
 }
 //#endregion
+//#region src/version.ts
+/**
+* Read the agent's own package version from disk.
+*
+* Walks up from this module's location until it finds a package.json whose
+* name is '@kici-dev/agent'. This is robust to the agent's bundled dist layout
+* (build-service.mjs emits dist/index.js / dist/server.js, so a fixed relative
+* depth would be wrong). Returns null when it can't be resolved so the
+* agent.register message simply omits the field rather than failing.
+*/
+function readAgentVersion() {
+	try {
+		let dir = path.dirname(fileURLToPath(import.meta.url));
+		for (let i = 0; i < 8; i++) {
+			const candidate = path.join(dir, "package.json");
+			if (fs.existsSync(candidate)) {
+				const pkg = JSON.parse(fs.readFileSync(candidate, "utf-8"));
+				if (pkg.name === "@kici-dev/agent" && typeof pkg.version === "string") return pkg.version;
+			}
+			const parent = path.dirname(dir);
+			if (parent === dir) break;
+			dir = parent;
+		}
+		return null;
+	} catch {
+		return null;
+	}
+}
+//#endregion
 //#region src/ws/event-buffer.ts
 /**
 * In-memory buffer for agent-to-orchestrator messages during disconnection.
@@ -467,6 +498,47 @@ var OrchestratorClient = class OrchestratorClient {
 		});
 	}
 	/**
+	* Request a presigned PUT URL for a provenance bundle. Sends a
+	* `provenance.upload.request` and waits for a `provenance.upload.response`
+	* (resolved via the shared upload-request pending map). Times out after 30s.
+	*/
+	async requestProvenanceUploadUrl(jobId, subjectDigest) {
+		const messageId = randomUUID();
+		return new Promise((resolve, reject) => {
+			const timer = setTimeout(() => {
+				this.pendingUploadRequests.delete(messageId);
+				reject(/* @__PURE__ */ new Error("Provenance upload URL request timed out (30s)"));
+			}, 3e4);
+			this.pendingUploadRequests.set(messageId, {
+				resolve: (url) => {
+					clearTimeout(timer);
+					resolve(url);
+				},
+				reject: (err) => {
+					clearTimeout(timer);
+					reject(err);
+				}
+			});
+			this.sendDirect({
+				type: "provenance.upload.request",
+				messageId,
+				jobId,
+				subjectDigest
+			});
+		});
+	}
+	/** Notify the orchestrator a provenance bundle upload completed (records an attestations row). */
+	sendProvenanceUploadComplete(jobId, subjectName, subjectDigest, mediaType) {
+		this.sendDirect({
+			type: "provenance.upload.complete",
+			messageId: randomUUID(),
+			jobId,
+			subjectName,
+			subjectDigest,
+			mediaType
+		});
+	}
+	/**
 	* Send an event.emit WS message to the orchestrator and await the response.
 	*
 	* Used by the job runner to relay custom event emissions from the sandbox
@@ -628,6 +700,27 @@ var OrchestratorClient = class OrchestratorClient {
 		});
 	}
 	/**
+	* Relay a provenance bundle upload operation to the orchestrator. Maps the
+	* IPC `provenance.request` onto `requestProvenanceUploadUrl` (returns the
+	* presigned URL) or `sendProvenanceUploadComplete` (fire-and-forget) and
+	* returns the result on the IPC response shape.
+	*/
+	async relayProvenance(jobId, request) {
+		if (request.op === "complete") {
+			this.sendProvenanceUploadComplete(jobId, request.subjectName, request.subjectDigest, request.mediaType);
+			return {
+				type: "provenance.response",
+				requestId: request.requestId
+			};
+		}
+		const uploadUrl = await this.requestProvenanceUploadUrl(jobId, request.subjectDigest);
+		return {
+			type: "provenance.response",
+			requestId: request.requestId,
+			uploadUrl
+		};
+	}
+	/**
 	* Relay a step-level approval request to the orchestrator. Sends a
 	* `step.approval-request` WS message and resolves with the orchestrator's
 	* `step.approval-resolved` mapped onto the IPC response shape. No client-side
@@ -814,7 +907,7 @@ var OrchestratorClient = class OrchestratorClient {
 			return;
 		}
 		const rawMsg = raw;
-		if (rawMsg.type === "cache.upload.response") {
+		if (rawMsg.type === "cache.upload.response" || rawMsg.type === "provenance.upload.response") {
 			const pending = this.pendingUploadRequests.get(rawMsg.requestId);
 			if (pending) {
 				this.pendingUploadRequests.delete(rawMsg.requestId);
@@ -1094,6 +1187,10 @@ var OrchestratorClient = class OrchestratorClient {
 			totalMemoryMb: Math.round(os.totalmem() / (1024 * 1024)),
 			cpuCount: os.cpus().length,
 			nodeVersion: process.versions.node,
+			...(() => {
+				const v = readAgentVersion();
+				return v ? { version: v } : {};
+			})(),
 			...(() => {
 				try {
 					const info = os.userInfo();
@@ -1202,14 +1299,14 @@ var init_console_capture = __esmMin((() => {
 init_console_capture();
 function safe(name, fallback = "unknown") {
 	switch (name) {
-		case "version": return "0.1.16";
-		case "buildCommit": return "7d97bb32c";
-		case "sdkVersion": return "0.1.16";
-		case "sdkBundleHash": return "cd4b8e0d91efe578c96e7c746f89b44a3df8fcaebaec2185399168ef8eb4ebca";
-		case "sharedVersion": return "0.1.16";
-		case "sharedBundleHash": return "c58b1596e92c8423ef83958e86894cb150315d8b91578a0080f1c645000e93e8";
-		case "engineVersion": return "0.1.16";
-		case "engineBundleHash": return "a611c0017d08faa9c5aa4fd97c3dd6259f53f3cca248bd2b369ad5d30c394847";
+		case "version": return "0.1.18";
+		case "buildCommit": return "d8cff38bb";
+		case "sdkVersion": return "0.1.18";
+		case "sdkBundleHash": return "8308089347c304e41b457d3867b17bbff11d6b5cd9706b6823e7abdbd849f33f";
+		case "sharedVersion": return "0.1.18";
+		case "sharedBundleHash": return "5f2c220f24d166b0f13d0620a2e80d19689ac8b683a12154daef44e938fd46a7";
+		case "engineVersion": return "0.1.18";
+		case "engineBundleHash": return "79ce14640d1798eaaa7cb3aa6c4bc325da3bff1e9f4716936e19614eabb1d858";
 		default: return fallback;
 	}
 }
@@ -1766,7 +1863,7 @@ async function buildAssetDigestFromResolvedPaths(workDir, resolvedPaths) {
 	for (const rel of resolvedPaths) {
 		const abs = path.join(workDir, rel);
 		try {
-			const content = await fs.readFile(abs, "utf-8");
+			const content = await fs$1.readFile(abs, "utf-8");
 			parts.push(`${rel}\n${content}`);
 		} catch {
 			parts.push(`${rel}\n`);
@@ -1791,7 +1888,7 @@ async function loadWorkflowSource(workDir, sourceFile, expectedContentHash, reso
 	ensureLoaderHookRegistered();
 	const filePath = path.join(workDir, sourceFile);
 	if (expectedContentHash) {
-		const rawSource = await fs.readFile(filePath, "utf-8");
+		const rawSource = await fs$1.readFile(filePath, "utf-8");
 		let assetDigest;
 		if (resolvedHashFiles?.length) assetDigest = await buildAssetDigestFromResolvedPaths(workDir, resolvedHashFiles);
 		const actualHash = computeContentHash(rawSource, assetDigest);
@@ -1854,18 +1951,20 @@ function extractSteps(workflow, jobName) {
 * A sibling mismatch logs a warning; a missing target job throws a clear
 * determinism error.
 */
-async function extractStepsFromDynamicJob(workflow, dynamicIndex, jobName, event, env, apiTransport, expectedJobNames) {
+async function extractStepsFromDynamicJob(workflow, dynamicIndex, jobName, event, env, apiTransport, expectedJobNames, upstreamSnapshot, declaredNeeds) {
 	const dynamicFn = extractDynamicJobFn(workflow, dynamicIndex);
 	const { $ } = await import("zx");
 	const { createLogger } = await import("@kici-dev/shared");
-	const { buildKiciApi } = await import("@kici-dev/sdk");
+	const { buildKiciApi, buildNeedsContext } = await import("@kici-dev/sdk");
 	const log = createLogger({ prefix: `dynamic-job-fn:${workflow.name}` });
 	const kici = buildKiciApi(apiTransport ?? (() => Promise.reject(/* @__PURE__ */ new Error("Agent API not available during re-evaluation"))));
+	const needs = upstreamSnapshot ? buildNeedsContext(upstreamSnapshot, declaredNeeds ?? []) : void 0;
 	const generatedJobs = await dynamicFn({
 		$,
 		ctx: {
 			workflow: { name: workflow.name },
-			event
+			event,
+			...needs && { needs }
 		},
 		log,
 		env,
@@ -1893,8 +1992,8 @@ async function extractStepsFromDynamicJob(workflow, dynamicIndex, jobName, event
 }
 var AGENT_SDK_VERSION, AGENT_SDK_BUNDLE_HASH, hookRegistered;
 var init_workflow_loader = __esmMin((() => {
-	AGENT_SDK_VERSION = "0.1.16";
-	AGENT_SDK_BUNDLE_HASH = "cd4b8e0d91efe578c96e7c746f89b44a3df8fcaebaec2185399168ef8eb4ebca";
+	AGENT_SDK_VERSION = "0.1.18";
+	AGENT_SDK_BUNDLE_HASH = "8308089347c304e41b457d3867b17bbff11d6b5cd9706b6823e7abdbd849f33f";
 	hookRegistered = false;
 }));
 //#endregion
@@ -2060,24 +2159,24 @@ function resolveOrchestratorUrl(url) {
 * have nothing to race; the defensive `rm` covers re-runs.
 */
 async function moveScratchIntoRepo(scratchDir, workDir) {
-	for (const child of await fs.readdir(scratchDir)) if (child === ".kici") {
+	for (const child of await fs$1.readdir(scratchDir)) if (child === ".kici") {
 		const kiciScratch = join(scratchDir, ".kici");
-		for (const sub of await fs.readdir(kiciScratch)) await moveInto(join(kiciScratch, sub), join(workDir, ".kici", sub));
+		for (const sub of await fs$1.readdir(kiciScratch)) await moveInto(join(kiciScratch, sub), join(workDir, ".kici", sub));
 	} else await moveInto(join(scratchDir, child), join(workDir, child));
 }
 /** Move `src` to `dest`, creating the parent and clearing any stale dest. */
 async function moveInto(src, dest) {
 	await mkdir(dirname(dest), { recursive: true });
-	await fs.rm(dest, {
+	await fs$1.rm(dest, {
 		recursive: true,
 		force: true
 	});
-	await fs.rename(src, dest);
+	await fs$1.rename(src, dest);
 }
 /** Best-effort cleanup of a settled scratch dir; logs and continues on failure. */
 async function cleanupScratch(scratchDir) {
 	try {
-		await fs.rm(scratchDir, {
+		await fs$1.rm(scratchDir, {
 			recursive: true,
 			force: true
 		});
@@ -2111,7 +2210,7 @@ async function restoreDeps(workDir, depsUrl, depsHash) {
 	const kiciDir = join(workDir, ".kici");
 	if (depsUrl.startsWith("file://")) {
 		const localPath = fileURLToPath(depsUrl);
-		const data = await fs.readFile(localPath);
+		const data = await fs$1.readFile(localPath);
 		if (depsHash) {
 			const actualHash = computeHash(data);
 			if (actualHash !== depsHash) throw new Error(`Dep tarball hash mismatch: expected ${depsHash}, got ${actualHash}`);
@@ -2270,7 +2369,7 @@ async function restoreSource(workDir, sourceTarUrl) {
 	let data;
 	if (sourceTarUrl.startsWith("file://")) {
 		const localPath = fileURLToPath(sourceTarUrl);
-		data = await fs.readFile(localPath);
+		data = await fs$1.readFile(localPath);
 	} else if (sourceTarUrl.startsWith("http://") || sourceTarUrl.startsWith("https://")) data = await downloadUrl(sourceTarUrl);
 	else throw new Error(`Unsupported source tarball URL scheme: ${sourceTarUrl}`);
 	await extractSourceTarball(data, workDir);
@@ -2339,6 +2438,28 @@ function findJobByName(workflow, jobName) {
 async function evaluateDynamicFields(workflow, jobName, event, flags, timeoutMs = 6e4) {
 	const job = findJobByName(workflow, jobName);
 	const result = {};
+	if (flags.dynamicMatrix && typeof job.matrix === "function") {
+		const matrixContext = {
+			$: (await import("zx")).$,
+			ctx: {
+				workflow: { name: workflow.name },
+				job: {
+					name: jobName,
+					runsOn: job.runsOn
+				}
+			},
+			log: {
+				info: () => {},
+				warn: () => {},
+				error: () => {},
+				debug: () => {}
+			},
+			env: { ...process.env }
+		};
+		let combos = expandMatrix(await withTimeout(() => job.matrix(matrixContext), timeoutMs, `dynamicMatrix for job '${jobName}'`));
+		if (job.include || job.exclude) combos = applyIncludeExclude(combos, job.include, job.exclude);
+		result.matrixValues = combos;
+	}
 	if (flags.dynamicEnvironment && typeof job.environment === "function") {
 		const value = await withTimeout(() => job.environment(event), timeoutMs, `dynamicEnvironment for job '${jobName}'`);
 		if (value !== void 0 && value !== null) result.environmentName = value;
@@ -2379,7 +2500,7 @@ async function serializeJobsToLock(jobs, ctx, staticNames, allowedGroups) {
 	return result;
 }
 async function serializeJob(job, generatedNames, ctx, staticNames, allowedGroups) {
-	const { runsOn, excludeLabels } = normalizeRunsOn(job.runsOn);
+	const { include: runsOn, exclude: excludeLabels } = normalizeRunsOnToMatchers(job.runsOn, `generated job '${job.name}' runsOn`);
 	let resolvedEnvironment;
 	if (typeof job.environment === "function") {
 		const value = await withTimeout(() => job.environment(ctx.event), DYNAMIC_FIELD_TIMEOUT_MS, `dynamic environment for generated job '${job.name}'`);
@@ -2402,7 +2523,7 @@ async function serializeJob(job, generatedNames, ctx, staticNames, allowedGroups
 		_type: "static",
 		name: job.name,
 		runsOn,
-		...excludeLabels ? { excludeLabels } : {},
+		...excludeLabels.length > 0 ? { excludeLabels } : {},
 		needs: resolvedNeeds,
 		...dependsOnGroups.length > 0 ? { dependsOnGroups } : {},
 		steps: serializeSteps(job.steps),
@@ -2416,20 +2537,6 @@ async function serializeJob(job, generatedNames, ctx, staticNames, allowedGroups
 	};
 }
 /**
-* Normalize the polymorphic RunsOn type into the lock file format.
-*/
-function normalizeRunsOn(runsOn) {
-	if (typeof runsOn === "string") return { runsOn };
-	if (Array.isArray(runsOn)) return { runsOn };
-	const selector = runsOn;
-	const labels = typeof selector.labels === "string" ? [selector.labels] : selector.labels;
-	const exclude = selector.exclude ? typeof selector.exclude === "string" ? [selector.exclude] : selector.exclude : void 0;
-	return {
-		runsOn: labels,
-		...exclude ? { excludeLabels: exclude } : {}
-	};
-}
-/**
 * Resolve needs references. Jobs can reference other jobs by name (string),
 * Job object reference, DynamicGroupRef, or NeedsEntry/NeedsGroupEntry objects.
 * Validates against generatedNames union staticNames union allowedGroups.
@@ -2515,7 +2622,7 @@ async function serializeMatrix(matrix, jobName, runsOn, ctx) {
 			workflow: { name: ctx.workflowName },
 			job: {
 				name: jobName,
-				runsOn: typeof runsOn === "string" ? runsOn : [...runsOn]
+				runsOn: runsOn.map((m) => m.kind === "exact" ? m.value : `/${m.source}/${m.flags}`)
 			}
 		},
 		log: ctx.log,
@@ -2541,6 +2648,7 @@ var MatrixExpansionError, DYNAMIC_FIELD_TIMEOUT_MS;
 var init_dynamic_job_serializer = __esmMin((() => {
 	init_timeout_util();
 	MatrixExpansionError = class MatrixExpansionError extends Error {
+		jobName;
 		name = "MatrixExpansionError";
 		constructor(jobName, message) {
 			super(message);
@@ -2814,7 +2922,7 @@ function decryptBuffer(encrypted, aesKey) {
 */
 async function applyOverlay(config) {
 	const { tarballUrl, cliPublicKey, orchestratorPrivateKey, repoDir } = config;
-	const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "kici-overlay-"));
+	const tmpDir = await fs$1.mkdtemp(path.join(os.tmpdir(), "kici-overlay-"));
 	try {
 		logger$7.info("Downloading overlay tarball", { url: tarballUrl.replace(/\?.*$/, "?[redacted]") });
 		let encryptedData;
@@ -2828,7 +2936,7 @@ async function applyOverlay(config) {
 		const decryptedData = decryptBuffer(encryptedData, aesKey);
 		logger$7.info("Extracting overlay tarball", { size: decryptedData.length });
 		const extractDir = path.join(tmpDir, "extracted");
-		await fs.mkdir(extractDir, { recursive: true });
+		await fs$1.mkdir(extractDir, { recursive: true });
 		try {
 			const readable = Readable.from(decryptedData);
 			await new Promise((resolve, reject) => {
@@ -2843,7 +2951,7 @@ async function applyOverlay(config) {
 		const manifestPath = path.join(extractDir, ".kici-overlay-tmp", "manifest.json");
 		let manifestContent;
 		try {
-			manifestContent = await fs.readFile(manifestPath, "utf-8");
+			manifestContent = await fs$1.readFile(manifestPath, "utf-8");
 		} catch {
 			throw new Error("Overlay manifest not found: expected .kici-overlay-tmp/manifest.json in tarball");
 		}
@@ -2864,15 +2972,15 @@ async function applyOverlay(config) {
 		for (const file of checksumFiles) {
 			const srcPath = path.join(extractDir, file);
 			const destPath = path.join(repoDir, file);
-			await fs.mkdir(path.dirname(destPath), { recursive: true });
-			await fs.copyFile(srcPath, destPath);
+			await fs$1.mkdir(path.dirname(destPath), { recursive: true });
+			await fs$1.copyFile(srcPath, destPath);
 			filesApplied++;
 		}
 		let filesDeleted = 0;
 		for (const file of manifest.deletions) {
 			const targetPath = path.join(repoDir, file);
 			try {
-				await fs.unlink(targetPath);
+				await fs$1.unlink(targetPath);
 				filesDeleted++;
 			} catch {
 				logger$7.debug("Deletion target not found, skipping", { file });
@@ -2888,7 +2996,7 @@ async function applyOverlay(config) {
 			verified: true
 		};
 	} finally {
-		await fs.rm(tmpDir, {
+		await fs$1.rm(tmpDir, {
 			recursive: true,
 			force: true
 		}).catch(() => {});
@@ -2941,7 +3049,7 @@ function noopResult() {
 	};
 }
 /** Build the synthesized env-var name for registry index `i`. */
-function tokenEnvName(jobIdShort, index) {
+function tokenEnvName$1(jobIdShort, index) {
 	return `KICI_NPM_TOKEN_${jobIdShort}_${index}`;
 }
 /** Render the agent-managed block of `.npmrc` lines. */
@@ -2950,7 +3058,7 @@ function renderAgentLines(registries, jobIdShort) {
 	const lines = [];
 	for (let i = 0; i < registries.length; i++) {
 		const reg = registries[i];
-		const envVar = tokenEnvName(jobIdShort, i);
+		const envVar = tokenEnvName$1(jobIdShort, i);
 		const authKey = reg.url.replace(/^https?:/, "");
 		if (reg.scope) lines.push(`${reg.scope}:registry=${reg.url}`);
 		else lines.push(`registry=${reg.url}`);
@@ -2982,7 +3090,7 @@ async function applyNpmRegistryConfig(args) {
 	const tokenEnv = {};
 	const tokensForRedaction = [];
 	for (let i = 0; i < registries.length; i++) {
-		tokenEnv[tokenEnvName(args.jobIdShort, i)] = registries[i].token;
+		tokenEnv[tokenEnvName$1(args.jobIdShort, i)] = registries[i].token;
 		tokensForRedaction.push(registries[i].token);
 	}
 	for (const value of Object.values(installEnvSecrets)) if (value) tokensForRedaction.push(value);
@@ -3020,6 +3128,113 @@ function redactNpmOutput(input, tokens) {
 }
 var init_npm_registry_config = __esmMin((() => {}));
 //#endregion
+//#region src/execution/yarnrc-berry-config.ts
+/**
+* Apply yarn-berry registry auth + a forced `nodeLinker: node-modules` to a
+* workflow's `.kici/.yarnrc.yml` for the lifetime of one `yarn install`, then
+* restore the file on cleanup. The berry analog of `npm-registry-config.ts`:
+* berry reads `.yarnrc.yml` (not `.npmrc`), so the auth block uses berry's
+* `npmRegistryServer` / `npmScopes` / `npmAuthToken` keys with `${VAR}`
+* env-var interpolation. Token bytes never reach disk — each registry token is
+* exposed as a job-scoped env var and the on-disk value is the `${VAR}`
+* reference.
+*
+* `nodeLinker: node-modules` makes berry lay down a real `node_modules` tree
+* (no PnP `.pnp.cjs`), so the agent's packer / restore / sibling-walk /
+* workflow-loader work unchanged. `enableScripts: false` (when a private
+* registry is configured) keeps dependency lifecycle scripts from seeing the
+* synthesized token env vars — the same security model as npm/pnpm/classic
+* `--ignore-scripts`.
+*
+* Reuses the same `ApplyNpmRegistryConfigArgs` / `ApplyNpmRegistryConfigResult`
+* shapes as the npm overlay so `dep-installer` can pick either by flavor.
+*/
+/** Build the synthesized env-var name for registry index `i`. */
+function tokenEnvName(jobIdShort, index) {
+	return `KICI_NPM_TOKEN_${jobIdShort}_${index}`;
+}
+/** Read + parse an existing `.yarnrc.yml`, or `{}` when absent/empty. */
+async function readOriginalYarnrc(path) {
+	try {
+		const raw = await readFile(path, "utf8");
+		return {
+			raw,
+			doc: parse(raw) ?? {}
+		};
+	} catch (err) {
+		if (err.code === "ENOENT") return {
+			raw: null,
+			doc: {}
+		};
+		throw err;
+	}
+}
+function buildRegistryBlock(envVar, url, alwaysAuth) {
+	return {
+		npmRegistryServer: url,
+		npmAuthToken: `\${${envVar}}`,
+		...alwaysAuth ? { npmAlwaysAuth: true } : {}
+	};
+}
+async function applyYarnrcBerryConfig(args) {
+	const registries = args.npmRegistries ?? [];
+	const installEnvSecrets = args.installEnvSecrets ?? {};
+	const hasPrivateRegistry = registries.length > 0 || Object.keys(installEnvSecrets).length > 0;
+	const yarnrcPath = join(args.kiciDir, ".yarnrc.yml");
+	const { raw: original, doc } = await readOriginalYarnrc(yarnrcPath);
+	const cacheFolder = await mkdtemp(join(tmpdir(), "kici-yarn-berry-cache-"));
+	const merged = {
+		...doc,
+		nodeLinker: "node-modules",
+		enableGlobalCache: false,
+		cacheFolder
+	};
+	const tokenEnv = {};
+	const tokensForRedaction = [];
+	if (hasPrivateRegistry) {
+		merged.enableScripts = false;
+		const npmScopes = { ...doc.npmScopes ?? {} };
+		for (let i = 0; i < registries.length; i++) {
+			const reg = registries[i];
+			const envVar = tokenEnvName(args.jobIdShort, i);
+			tokenEnv[envVar] = reg.token;
+			tokensForRedaction.push(reg.token);
+			const block = buildRegistryBlock(envVar, reg.url, reg.alwaysAuth);
+			if (reg.scope) npmScopes[reg.scope] = block;
+			else {
+				merged.npmRegistryServer = reg.url;
+				merged.npmAuthToken = block.npmAuthToken;
+				if (reg.alwaysAuth) merged.npmAlwaysAuth = true;
+			}
+		}
+		if (Object.keys(npmScopes).length > 0) merged.npmScopes = npmScopes;
+		for (const value of Object.values(installEnvSecrets)) if (value) tokensForRedaction.push(value);
+	}
+	await writeFile(yarnrcPath, stringify(merged), {
+		encoding: "utf8",
+		mode: 384
+	});
+	const cleanup = async () => {
+		try {
+			if (original === null) await unlink(yarnrcPath).catch(() => {});
+			else await writeFile(yarnrcPath, original, { encoding: "utf8" });
+		} catch {}
+		await rm(cacheFolder, {
+			recursive: true,
+			force: true
+		}).catch(() => {});
+	};
+	return {
+		extraEnv: {
+			...installEnvSecrets,
+			...tokenEnv
+		},
+		tokensForRedaction,
+		cleanup
+	};
+}
+var init_yarnrc_berry_config = __esmMin((() => {}));
+//#endregion
 //#region src/execution/validate-kici-deps.ts
 /**
 * Pre-install validation for `.kici/` dependency specifiers.
@@ -3037,6 +3252,13 @@ var init_npm_registry_config = __esmMin((() => {}));
 *   clones the whole repo, so an in-repo sibling is present), and resolves
 *   `file:`/`link:`/`portal:` against a path — allowed when that path stays
 *   inside the cloned repo, rejected when it escapes the clone.
+* - yarn classic (v1) has no `workspace:` protocol and no `portal:` — it links
+*   in-repo siblings by version range, not by a local specifier — so both are
+*   rejected with guidance; `file:`/`link:` are allowed when the path stays
+*   inside the clone, rejected when it escapes.
+* - yarn berry (v2+) resolves `workspace:` against the repo-root package.json
+*   `workspaces` field and `portal:`/`file:`/`link:` against inside-repo paths,
+*   so those are allowed when present/inside the clone and rejected otherwise.
 *
 * This module performs that classification so unresolvable specifiers fail
 * fast with guidance rather than a cryptic install error.
@@ -3096,6 +3318,17 @@ async function fileExists$1(target) {
 		return false;
 	}
 }
+/** Whether the repo-root package.json declares a non-empty `workspaces` array. */
+async function rootHasWorkspaces(repoRoot) {
+	try {
+		const ws = JSON.parse(await readFile(join(repoRoot, "package.json"), "utf-8")).workspaces;
+		if (Array.isArray(ws)) return ws.length > 0;
+		if (ws && typeof ws === "object" && Array.isArray(ws.packages)) return ws.packages.length > 0;
+		return false;
+	} catch {
+		return false;
+	}
+}
 /** Resolve a `file:`/`link:`/`portal:` spec to an absolute path under kiciDir. */
 function resolveLocalPath(kiciDir, dep) {
 	const rawPath = dep.spec.slice(dep.protocol.length);
@@ -3110,8 +3343,31 @@ function isInsideRepo(repoRoot, target) {
 * Classify each local-protocol dependency for the detected package manager and
 * return the ones that are unresolvable in the agent's single-clone model.
 */
-async function findUnresolvableDeps(deps, packageManager, kiciDir, repoRoot) {
+async function findUnresolvableDeps(deps, packageManager, kiciDir, repoRoot, yarnFlavor) {
 	if (packageManager === PackageManager.Npm) return [...deps];
+	if (packageManager === PackageManager.Yarn && yarnFlavor === YarnFlavor.Berry) {
+		const hasWorkspaces = await rootHasWorkspaces(repoRoot);
+		const unresolvable = [];
+		for (const dep of deps) {
+			if (dep.protocol === "workspace:") {
+				if (!hasWorkspaces) unresolvable.push(dep);
+				continue;
+			}
+			if (!isInsideRepo(repoRoot, resolveLocalPath(kiciDir, dep))) unresolvable.push(dep);
+		}
+		return unresolvable;
+	}
+	if (packageManager === PackageManager.Yarn) {
+		const unresolvable = [];
+		for (const dep of deps) {
+			if (dep.protocol === "workspace:" || dep.protocol === "portal:") {
+				unresolvable.push(dep);
+				continue;
+			}
+			if (!isInsideRepo(repoRoot, resolveLocalPath(kiciDir, dep))) unresolvable.push(dep);
+		}
+		return unresolvable;
+	}
 	const hasWorkspaceFile = await fileExists$1(join(repoRoot, "pnpm-workspace.yaml"));
 	const unresolvable = [];
 	for (const dep of deps) {
@@ -3124,9 +3380,11 @@ async function findUnresolvableDeps(deps, packageManager, kiciDir, repoRoot) {
 	return unresolvable;
 }
 /** Build the actionable error for unresolvable local-protocol dependencies. */
-function formatUnresolvableDepError(offenders, packageManager) {
+function formatUnresolvableDepError(offenders, packageManager, yarnFlavor) {
 	const list = offenders.map((o) => `${o.name}: ${o.spec}`).join(", ");
 	if (packageManager === PackageManager.Npm) return `These .kici/ dependencies use local-protocol specifiers npm cannot resolve from a registry: ${list}. npm has no workspace protocol — pin a published version, publish the package to your registry, or use pnpm so an in-repo workspace sibling can be resolved.`;
+	if (packageManager === PackageManager.Yarn && yarnFlavor === YarnFlavor.Berry) return `These .kici/ dependencies cannot be resolved by yarn berry from the cloned repository: ${list}. A workspace: dependency requires a "workspaces" array in the repo-root package.json, and file:/link:/portal: paths must stay inside this repository.`;
+	if (packageManager === PackageManager.Yarn) return `These .kici/ dependencies use specifiers yarn classic cannot resolve: ${list}. yarn classic has no workspace: or portal: protocol — reference an in-repo sibling by a version range (yarn links matching workspace members), use pnpm, or keep file:/link: paths inside this repository. (yarn berry support requires a yarn@2+ packageManager field or a .yarnrc.yml.)`;
 	return `These .kici/ dependencies point outside the cloned repository, which the agent never has: ${list}. A workspace: dependency requires a pnpm-workspace.yaml at the repo root, and file:/link:/portal: paths must stay inside this repository.`;
 }
 /**
@@ -3140,9 +3398,10 @@ async function assertResolvableDeps(args) {
 	if (!pkg) return;
 	const localDeps = findLocalProtocolDeps(pkg);
 	if (localDeps.length === 0) return;
-	const offenders = await findUnresolvableDeps(localDeps, args.packageManager, args.kiciDir, args.repoRoot);
+	const flavor = args.yarnFlavor ?? YarnFlavor.Classic;
+	const offenders = await findUnresolvableDeps(localDeps, args.packageManager, args.kiciDir, args.repoRoot, flavor);
 	if (offenders.length === 0) return;
-	throw new Error(formatUnresolvableDepError(offenders, args.packageManager));
+	throw new Error(formatUnresolvableDepError(offenders, args.packageManager, flavor));
 }
 var LOCAL_PROTOCOLS, DEP_FIELDS;
 var init_validate_kici_deps = __esmMin((() => {
@@ -3160,6 +3419,102 @@ var init_validate_kici_deps = __esmMin((() => {
 	];
 }));
 //#endregion
+//#region src/execution/workspace-siblings.ts
+/**
+* In-repo workspace-sibling discovery for the agent's dependency handling.
+*
+* A pnpm or yarn-classic workspace lays out a `.kici/` member's `workspace:`
+* (pnpm) or version-range (yarn) siblings as symlinks pointing at package
+* directories that live inside the clone but outside `.kici/` and outside the
+* `node_modules` store. The dep-cache packer must travel those sibling dirs with
+* the closure (their symlinks would dangle otherwise), and the yarn install path
+* must build them (the install links a sibling but does not build it).
+*
+* `collectInRepoSiblings` walks a starting `node_modules` (and transitively each
+* discovered sibling's `node_modules`), returning each in-repo sibling directory
+* once, repo-root-relative, in breadth-first discovery order. The starting
+* `node_modules` is a parameter so it serves pnpm + yarn-standalone (seeded at
+* `.kici/node_modules`) and yarn-workspace-member (seeded at the hoisted root
+* `node_modules`).
+*/
+/**
+* The directory yarn lays `.kici`'s dependencies into. A standalone `.kici`
+* (own lockfile, no parent workspace) gets `.kici/node_modules`; a workspace
+* member hoists everything to the repo-root `node_modules`, leaving no
+* `.kici/node_modules`.
+*/
+function resolveYarnNodeModulesRoot(repoRoot, kiciDir) {
+	const kiciNm = join(kiciDir, "node_modules");
+	return existsSync(kiciNm) ? kiciNm : join(repoRoot, "node_modules");
+}
+/**
+* Walk `seedNodeModules` (and transitively each in-repo sibling's
+* `node_modules`) collecting the repo-root-relative directories of workspace
+* siblings — package dirs that live inside the clone but outside `.kici/` and
+* outside the repo-root `node_modules/` store. Returns each dir once, in
+* discovery (BFS) order.
+*/
+async function collectInRepoSiblings(workDir, kiciDir, seedNodeModules = join(kiciDir, "node_modules")) {
+	const repoRoot = resolve(workDir);
+	const kiciResolved = resolve(kiciDir);
+	const rootNodeModules = resolve(join(workDir, "node_modules"));
+	const found = /* @__PURE__ */ new Set();
+	const visited = /* @__PURE__ */ new Set();
+	const queue = [seedNodeModules];
+	while (queue.length > 0) {
+		const nmDir = queue.shift();
+		const real = await realpath(nmDir).catch(() => null);
+		if (!real || visited.has(real)) continue;
+		visited.add(real);
+		for (const target of await resolveNodeModulesLinks(nmDir)) {
+			if (!isInside(repoRoot, target)) continue;
+			if (isInside(kiciResolved, target) || isInside(rootNodeModules, target)) continue;
+			const rel = relative(workDir, target);
+			if (!found.has(rel)) {
+				found.add(rel);
+				queue.push(join(target, "node_modules"));
+			}
+		}
+	}
+	return [...found];
+}
+/** Resolve every package symlink target under a `node_modules` dir (descending one level into `@scope` dirs). */
+async function resolveNodeModulesLinks(nmDir) {
+	const targets = [];
+	for (const entry of await readdir(nmDir).catch(() => [])) {
+		if (entry.startsWith(".")) continue;
+		const entryPath = join(nmDir, entry);
+		if (entry.startsWith("@")) {
+			for (const scoped of await readdir(entryPath).catch(() => [])) {
+				const target = await resolveIfSymlink(join(entryPath, scoped));
+				if (target) targets.push(target);
+			}
+			continue;
+		}
+		const target = await resolveIfSymlink(entryPath);
+		if (target) targets.push(target);
+	}
+	return targets;
+}
+/** Return the real path of `p` if it is a symlink, else null. */
+async function resolveIfSymlink(p) {
+	try {
+		if (!(await lstat(p)).isSymbolicLink()) return null;
+		return await realpath(p);
+	} catch {
+		return null;
+	}
+}
+/** Whether `target` is `root` itself or a path inside it. */
+function isInside(root, target) {
+	const rel = relative(root, target);
+	return rel === "" || !rel.startsWith("..") && !rel.startsWith(`..${sep}`) && !isAbsoluteRel(rel);
+}
+function isAbsoluteRel(rel) {
+	return rel.length > 1 && rel[1] === ":";
+}
+var init_workspace_siblings = __esmMin((() => {}));
+//#endregion
 //#region src/execution/dep-installer.ts
 /**
 * Inline dependency installation for graceful degradation.
@@ -3167,12 +3522,17 @@ var init_validate_kici_deps = __esmMin((() => {
 * When the dep cache is unavailable or a download fails, the agent installs
 * `.kici/` dependencies directly with the repository's package manager.
 *
-* The package manager is detected from the cloned repo (npm / pnpm); the
+* The package manager is detected from the cloned repo (npm / pnpm / yarn); the
 * presence of `.kici/package.json` signals that deps should be installed. npm
 * is the default and ships with every Node.js install; pnpm is used when the
 * repo is a pnpm workspace so a `.kici/` member can resolve in-repo
-* `workspace:` siblings. yarn is detected but not yet supported and is
-* rejected with an actionable error.
+* `workspace:` siblings. yarn is supported in both flavors: classic (v1) reads
+* `.kici/.npmrc` for registry auth and links version-range workspace siblings;
+* berry (v2+) reads a synthesized `.kici/.yarnrc.yml` for auth, runs with a
+* forced `nodeLinker: node-modules` (so the resulting tree matches classic/npm
+* and the runner's plain node resolution holds), and resolves
+* `workspace:`/`portal:` siblings. Either flavor links the sibling but does not
+* build it, so the agent builds the in-repo closure after install.
 *
 * Security: the install runs with an isolated per-invocation cache/store
 * directory to prevent cache poisoning across build jobs — a malicious
@@ -3193,6 +3553,15 @@ async function detectKiciPackageManager(repoRoot, kiciDir) {
 	return await detectPackageManagerFromManifests(repoRoot) ?? await detectPackageManagerFromManifests(kiciDir) ?? PackageManager.Npm;
 }
 /**
+* Detect the yarn flavor (classic vs berry) for the cloned repo. Mirrors
+* `detectKiciPackageManager`: probe the repo root first, then `.kici/` for a
+* standalone project. Only called when the detected manager is `Yarn`.
+*/
+async function detectKiciYarnFlavor(repoRoot, kiciDir) {
+	if (await detectYarnFlavor(repoRoot) === YarnFlavor.Berry) return YarnFlavor.Berry;
+	return detectYarnFlavor(kiciDir);
+}
+/**
 * Install `.kici/` dependencies inline with the repo's package manager.
 *
 * Falls back to this when the dep cache is unavailable or a download fails.
@@ -3211,20 +3580,28 @@ async function detectKiciPackageManager(repoRoot, kiciDir) {
 async function installDeps(kiciDir, opts = {}) {
 	const repoRoot = opts.repoRoot ?? dirname(kiciDir);
 	const packageManager = await detectKiciPackageManager(repoRoot, kiciDir);
+	const yarnFlavor = packageManager === PackageManager.Yarn ? await detectKiciYarnFlavor(repoRoot, kiciDir) : YarnFlavor.Classic;
 	logger$6.info("Installing deps inline", {
 		packageManager,
+		yarnFlavor,
 		dir: kiciDir
 	});
-	process.stderr.write(`[dep-installer:trace] starting install: pm=${packageManager}, cwd=${kiciDir}\n`);
-	if (packageManager === PackageManager.Yarn) throw new Error("This repository uses yarn, which the KiCI agent does not yet support for .kici/ dependency installation. Use npm or pnpm for the .kici/ project, or open a feature request for yarn support.");
+	process.stderr.write(`[dep-installer:trace] starting install: pm=${packageManager}, flavor=${yarnFlavor}, cwd=${kiciDir}\n`);
 	await assertResolvableDeps({
 		kiciDir,
 		repoRoot,
-		packageManager
+		packageManager,
+		yarnFlavor
 	});
 	const startTime = Date.now();
 	const hasPrivateRegistry = (opts.npmRegistries?.length ?? 0) > 0 || (opts.installEnvSecrets ? Object.keys(opts.installEnvSecrets).length > 0 : false);
-	const registryConfig = await applyNpmRegistryConfig({
+	const isBerry = packageManager === PackageManager.Yarn && yarnFlavor === YarnFlavor.Berry;
+	const registryConfig = isBerry ? await applyYarnrcBerryConfig({
+		kiciDir,
+		npmRegistries: opts.npmRegistries,
+		installEnvSecrets: opts.installEnvSecrets,
+		jobIdShort: opts.jobIdShort ?? "00000000"
+	}) : await applyNpmRegistryConfig({
 		kiciDir,
 		npmRegistries: opts.npmRegistries,
 		installEnvSecrets: opts.installEnvSecrets,
@@ -3236,6 +3613,15 @@ async function installDeps(kiciDir, opts = {}) {
 			hasPrivateRegistry,
 			registryConfig
 		});
+		else if (isBerry) await runYarnBerryInstall({
+			kiciDir,
+			registryConfig
+		});
+		else if (packageManager === PackageManager.Yarn) await runYarnInstall({
+			kiciDir,
+			hasPrivateRegistry,
+			registryConfig
+		});
 		else await runNpmInstall({
 			kiciDir,
 			hasPrivateRegistry,
@@ -3250,6 +3636,7 @@ async function installDeps(kiciDir, opts = {}) {
 		await registryConfig.cleanup();
 	}
 	if (packageManager === PackageManager.Pnpm && await kiciHasLocalProtocolDeps(kiciDir)) await buildWorkspaceClosure(repoRoot);
+	if (packageManager === PackageManager.Yarn) await buildYarnWorkspaceClosure(repoRoot, kiciDir, yarnFlavor);
 	const durationMs = Date.now() - startTime;
 	process.stderr.write(`[dep-installer:trace] install complete: ${durationMs}ms\n`);
 	logger$6.info("Deps installed inline", {
@@ -3337,6 +3724,131 @@ async function runPnpmInstall(args) {
 		}).catch(() => {});
 	}
 }
+/** Pure: argv for `yarn install` with an isolated cache folder. */
+function buildYarnInstallArgs(cacheDir, hasPrivateRegistry) {
+	const a = [
+		"install",
+		"--cache-folder",
+		cacheDir,
+		"--non-interactive",
+		"--no-progress"
+	];
+	if (hasPrivateRegistry) a.push("--ignore-scripts");
+	return a;
+}
+/**
+* Run `yarn install` from `.kici/` with an isolated cache folder. yarn classic
+* reads the synthesized `.kici/.npmrc` (registry + `${VAR}` token expansion) for
+* private-registry auth. A workspace member hoists deps to the repo-root
+* node_modules; a standalone `.kici` gets `.kici/node_modules`. Not
+* `--frozen-lockfile` (resolved URLs in the lockfile may point at a different
+* registry than the synthesized `.npmrc`, e.g. localhost tunnel vs direct IP).
+*/
+async function runYarnInstall(args) {
+	await assertYarnAvailable();
+	const { nodeDir } = resolveNpm();
+	const cacheDir = await mkdtemp(join(tmpdir(), "kici-yarn-cache-"));
+	const env = envWithNodeOnPath(args.registryConfig.extraEnv, nodeDir);
+	const argv = buildYarnInstallArgs(cacheDir, args.hasPrivateRegistry);
+	try {
+		process.stderr.write(`[dep-installer:trace] running: yarn ${argv.join(" ")}\n`);
+		await execFileAsync("yarn", argv, {
+			cwd: args.kiciDir,
+			env,
+			timeout: INSTALL_TIMEOUT_MS,
+			maxBuffer: INSTALL_MAX_BUFFER
+		});
+	} finally {
+		await rm(cacheDir, {
+			recursive: true,
+			force: true
+		}).catch(() => {});
+	}
+}
+/** Pure: argv for a berry `yarn install`. Cache + linker live in .yarnrc.yml. */
+function buildYarnBerryInstallArgs() {
+	return ["install"];
+}
+/**
+* Run a berry `yarn install` from `.kici/`. The synthesized `.kici/.yarnrc.yml`
+* (applied by `applyYarnrcBerryConfig`) forces `nodeLinker: node-modules`, an
+* isolated `cacheFolder`, and — when a private registry is configured —
+* `enableScripts: false` + `npmScopes`/`npmRegistryServer` auth. corepack
+* provisions the repo-pinned berry version; `COREPACK_ENABLE_DOWNLOAD_PROMPT=0`
+* makes that non-interactive. Not `--immutable` (resolved URLs in the lockfile
+* may point at a different registry than the synthesized config).
+*/
+async function runYarnBerryInstall(args) {
+	await assertYarnAvailable();
+	const { nodeDir } = resolveNpm();
+	const env = {
+		...envWithNodeOnPath(args.registryConfig.extraEnv, nodeDir),
+		COREPACK_ENABLE_DOWNLOAD_PROMPT: "0"
+	};
+	const argv = buildYarnBerryInstallArgs();
+	process.stderr.write(`[dep-installer:trace] running: yarn ${argv.join(" ")} (berry)\n`);
+	await execFileAsync("yarn", argv, {
+		cwd: args.kiciDir,
+		env,
+		timeout: INSTALL_TIMEOUT_MS,
+		maxBuffer: INSTALL_MAX_BUFFER
+	});
+}
+/** Throw an actionable error when the repo needs yarn but it is not installed. */
+async function assertYarnAvailable() {
+	try {
+		await execFileAsync("yarn", ["--version"], {
+			timeout: 3e4,
+			cwd: tmpdir()
+		});
+	} catch (e) {
+		throw new Error(`This repository uses yarn, but yarn is not available on this agent. Install yarn (e.g. \`corepack enable\`) or run on a container/Firecracker agent that bundles it. (${toErrorMessage(e)})`);
+	}
+}
+/**
+* Build the in-repo workspace siblings `.kici` depends on (yarn links them on
+* install but does not build them). Walks siblings from the resolved
+* node_modules root and runs each sibling's `build` script in leaf-first
+* (reverse-discovery) order with a clean env (no synthesized registry tokens).
+* Deep cross-sibling build chains may build out of strict topological order —
+* real `.kici` closures are shallow.
+*/
+async function buildYarnWorkspaceClosure(repoRoot, kiciDir, yarnFlavor) {
+	const siblings = await collectInRepoSiblings(repoRoot, kiciDir, resolveYarnNodeModulesRoot(repoRoot, kiciDir));
+	if (siblings.length === 0) return;
+	const { nodeDir } = resolveNpm();
+	const env = envWithNodeOnPath({}, nodeDir);
+	for (const rel of [...siblings].reverse()) {
+		const sibDir = join(repoRoot, rel);
+		if (!await siblingHasBuildScript(sibDir)) continue;
+		const [argv, cwd] = yarnFlavor === YarnFlavor.Berry ? [["run", "build"], sibDir] : [[
+			"--cwd",
+			sibDir,
+			"run",
+			"build"
+		], repoRoot];
+		process.stderr.write(`[dep-installer:trace] building yarn sibling (${yarnFlavor}): yarn ${argv.join(" ")} @ ${cwd}\n`);
+		try {
+			await execFileAsync("yarn", argv, {
+				cwd,
+				env,
+				timeout: INSTALL_TIMEOUT_MS,
+				maxBuffer: INSTALL_MAX_BUFFER
+			});
+		} catch (e) {
+			logSubprocessStreams(e, []);
+			throw new Error(`Failed to build .kici yarn workspace sibling ${rel}: ${describeExecError(e)}`);
+		}
+	}
+}
+/** Whether a sibling package.json declares a `build` script. */
+async function siblingHasBuildScript(sibDir) {
+	try {
+		return typeof JSON.parse(await readFile(join(sibDir, "package.json"), "utf-8")).scripts?.build === "string";
+	} catch {
+		return false;
+	}
+}
 /**
 * Build the in-repo dependency closure of the `.kici/` package so a
 * `workspace:` sibling's build output exists before the workflow that imports
@@ -3380,7 +3892,10 @@ function describeExecError(e) {
 /** Throw an actionable error when the repo needs pnpm but it is not installed. */
 async function assertPnpmAvailable() {
 	try {
-		await execFileAsync("pnpm", ["--version"], { timeout: 3e4 });
+		await execFileAsync("pnpm", ["--version"], {
+			timeout: 3e4,
+			cwd: tmpdir()
+		});
 	} catch (e) {
 		throw new Error(`This repository is a pnpm workspace, but pnpm is not available on this agent. Install pnpm (e.g. \`corepack enable\`) or run on a container/ Firecracker agent that bundles it. (${toErrorMessage(e)})`);
 	}
@@ -3393,7 +3908,9 @@ function logSubprocessStreams(e, tokens) {
 var logger$6, execFileAsync, INSTALL_TIMEOUT_MS, INSTALL_MAX_BUFFER;
 var init_dep_installer = __esmMin((() => {
 	init_npm_registry_config();
+	init_yarnrc_berry_config();
 	init_validate_kici_deps();
+	init_workspace_siblings();
 	logger$6 = createLogger({ prefix: "dep-installer" });
 	execFileAsync = promisify(execFile);
 	INSTALL_TIMEOUT_MS = 6e5;
@@ -3409,13 +3926,21 @@ var init_dep_installer = __esmMin((() => {
 * **repo-root-relative** (cwd = the clone root) so restore is a single layout
 * regardless of package manager:
 *
-* - npm / yarn: just `.kici/node_modules`.
+* - npm: just `.kici/node_modules`.
 * - pnpm: `.kici/node_modules` plus the repo-root `node_modules/.pnpm` virtual
 *   store and the in-repo `workspace:` sibling package directories `.kici`
 *   depends on (with their built output). pnpm lays `.kici/node_modules` out as
 *   symlinks into the root store and into sibling dirs that live outside
 *   `.kici/`, so packing `.kici/node_modules` alone would capture dangling
 *   links — the store and siblings must travel together.
+* - yarn (classic + berry): the resolved node_modules root (standalone `.kici`
+*   → `.kici/node_modules`; hoisted workspace member → the repo-root
+*   `node_modules`) plus the in-repo sibling package directories `.kici` depends
+*   on (with their built output), whose symlinks would dangle otherwise. Berry
+*   runs with a forced `nodeLinker: node-modules`, so its tree has the same
+*   node_modules shape as classic and is packed identically (the flavor only
+*   changes how siblings are referenced — version range vs `workspace:`/`portal:`
+*   — not the packed layout).
 *
 * Uses tar.gz (Node.js built-in zlib, no external binary) in portable mode to
 * strip user/group info for cross-machine consistency; symlinks are preserved
@@ -3429,9 +3954,10 @@ var init_dep_installer = __esmMin((() => {
 * @throws Error if `.kici/node_modules` does not exist.
 */
 async function packNodeModules(kiciDir) {
-	if (!existsSync(join(kiciDir, "node_modules"))) throw new Error(`node_modules not found at ${join(kiciDir, "node_modules")}`);
 	const workDir = dirname(kiciDir);
 	const packageManager = await detectPackageManagerFromManifests(workDir) ?? await detectPackageManagerFromManifests(kiciDir) ?? PackageManager.Npm;
+	const nmRoot = packageManager === PackageManager.Yarn ? resolveYarnNodeModulesRoot(workDir, kiciDir) : join(kiciDir, "node_modules");
+	if (!existsSync(nmRoot)) throw new Error(`node_modules not found at ${nmRoot}`);
 	const entries = await closureEntries(workDir, kiciDir, packageManager);
 	logger$5.info("Packing dependency closure into tarball", {
 		dir: workDir,
@@ -3460,85 +3986,32 @@ async function packNodeModules(kiciDir) {
 	};
 }
 /**
-* Compute the repo-root-relative tar entries for the dependency closure. npm /
-* yarn need only `.kici/node_modules`; pnpm additionally needs the root store
-* and the in-repo workspace siblings `.kici` resolves.
+* Compute the repo-root-relative tar entries for the dependency closure. npm
+* needs only `.kici/node_modules`. pnpm additionally needs the root store and
+* the in-repo workspace siblings `.kici` resolves. yarn (classic + berry) packs
+* the resolved node_modules root (standalone → `.kici/node_modules`; hoisted
+* workspace member → root `node_modules`) plus the in-repo siblings, which it
+* links but does not place in the store. Berry's forced node-modules linker
+* gives it the same packed shape as classic.
 */
 async function closureEntries(workDir, kiciDir, packageManager) {
-	const kiciNodeModules = relative(workDir, join(kiciDir, "node_modules"));
-	if (packageManager !== PackageManager.Pnpm) return [kiciNodeModules];
-	const entries = [kiciNodeModules];
-	if (existsSync(join(workDir, "node_modules", ".pnpm"))) entries.push(join("node_modules", ".pnpm"));
-	for (const sibling of await collectInRepoSiblings(workDir, kiciDir)) entries.push(sibling);
-	return entries;
-}
-/**
-* Walk `.kici`'s `node_modules` (and transitively each in-repo sibling's
-* `node_modules`) collecting the repo-relative directories of `workspace:`
-* siblings — package dirs that live inside the clone but outside `.kici/` and
-* outside the root `node_modules/` store. Returns each dir once.
-*/
-async function collectInRepoSiblings(workDir, kiciDir) {
-	const repoRoot = resolve(workDir);
-	const kiciResolved = resolve(kiciDir);
-	const rootNodeModules = resolve(join(workDir, "node_modules"));
-	const found = /* @__PURE__ */ new Set();
-	const visited = /* @__PURE__ */ new Set();
-	const queue = [join(kiciDir, "node_modules")];
-	while (queue.length > 0) {
-		const nmDir = queue.shift();
-		const real = await realpath(nmDir).catch(() => null);
-		if (!real || visited.has(real)) continue;
-		visited.add(real);
-		for (const target of await resolveNodeModulesLinks(nmDir)) {
-			if (!isInside(repoRoot, target)) continue;
-			if (isInside(kiciResolved, target) || isInside(rootNodeModules, target)) continue;
-			const rel = relative(workDir, target);
-			if (!found.has(rel)) {
-				found.add(rel);
-				queue.push(join(target, "node_modules"));
-			}
-		}
+	if (packageManager === PackageManager.Pnpm) {
+		const entries = [relative(workDir, join(kiciDir, "node_modules"))];
+		if (existsSync(join(workDir, "node_modules", ".pnpm"))) entries.push(join("node_modules", ".pnpm"));
+		for (const sibling of await collectInRepoSiblings(workDir, kiciDir)) entries.push(sibling);
+		return entries;
 	}
-	return [...found];
-}
-/** Resolve every package symlink target under a `node_modules` dir (descending one level into `@scope` dirs). */
-async function resolveNodeModulesLinks(nmDir) {
-	const targets = [];
-	for (const entry of await readdir(nmDir).catch(() => [])) {
-		if (entry.startsWith(".")) continue;
-		const entryPath = join(nmDir, entry);
-		if (entry.startsWith("@")) {
-			for (const scoped of await readdir(entryPath).catch(() => [])) {
-				const target = await resolveIfSymlink(join(entryPath, scoped));
-				if (target) targets.push(target);
-			}
-			continue;
-		}
-		const target = await resolveIfSymlink(entryPath);
-		if (target) targets.push(target);
+	if (packageManager === PackageManager.Yarn) {
+		const nmRoot = resolveYarnNodeModulesRoot(workDir, kiciDir);
+		const entries = [relative(workDir, nmRoot)];
+		for (const sibling of await collectInRepoSiblings(workDir, kiciDir, nmRoot)) entries.push(sibling);
+		return entries;
 	}
-	return targets;
-}
-/** Return the real path of `p` if it is a symlink, else null. */
-async function resolveIfSymlink(p) {
-	try {
-		if (!(await lstat(p)).isSymbolicLink()) return null;
-		return await realpath(p);
-	} catch {
-		return null;
-	}
-}
-/** Whether `target` is `root` itself or a path inside it. */
-function isInside(root, target) {
-	const rel = relative(root, target);
-	return rel === "" || !rel.startsWith("..") && !rel.startsWith(`..${sep}`) && !isAbsoluteRel(rel);
-}
-function isAbsoluteRel(rel) {
-	return rel.length > 1 && rel[1] === ":";
+	return [relative(workDir, join(kiciDir, "node_modules"))];
 }
 var logger$5;
 var init_dep_packer = __esmMin((() => {
+	init_workspace_siblings();
 	logger$5 = createLogger({ prefix: "dep-packer" });
 }));
 //#endregion
@@ -3682,6 +4155,8 @@ var init_secret_encryption = __esmMin((() => {
 function buildRequest(dispatch, workDir) {
 	const jobConfig = dispatch.jobConfig;
 	return {
+		runId: dispatch.runId,
+		jobId: dispatch.jobId,
 		workDir,
 		repoUrl: dispatch.repoUrl,
 		ref: dispatch.ref,
@@ -3694,8 +4169,11 @@ function buildRequest(dispatch, workDir) {
 		depsUrl: dispatch.depsUrl,
 		depsHash: dispatch.depsHash,
 		workflowName: jobConfig.workflowName ?? "",
-		jobName: jobConfig.name ?? "",
+		jobName: jobConfig.baseJobName ?? jobConfig.name ?? "",
 		runsOn: jobConfig.runsOn ?? "",
+		matrixValues: jobConfig.matrixValues,
+		host: jobConfig.host,
+		agent: jobConfig.agent,
 		secrets: dispatch.secrets,
 		namespacedSecrets: dispatch.namespacedSecrets,
 		sourceFile: jobConfig.source?.file,
@@ -3962,6 +4440,24 @@ function relayCacheRequest$1(msg, ctx) {
 		error: toErrorMessage(err)
 	}));
 }
+/** Relay `provenance.request` and pipe the orchestrator response (or an error
+*  response, or a "not configured" response when the callback isn't wired) back
+*  into the sandbox runner. */
+function relayProvenanceRequest$1(msg, ctx) {
+	if (!ctx.execOptions.onProvenanceRequest) {
+		safeSendToChild(ctx.child, {
+			type: "provenance.response",
+			requestId: msg.requestId,
+			error: "Provenance not available in this agent configuration"
+		});
+		return;
+	}
+	ctx.execOptions.onProvenanceRequest(msg).then((response) => safeSendToChild(ctx.child, response), (err) => safeSendToChild(ctx.child, {
+		type: "provenance.response",
+		requestId: msg.requestId,
+		error: toErrorMessage(err)
+	}));
+}
 /** Relay `approval.request` and pipe the orchestrator's resolution (or a
 *  fail-closed reject when the callback isn't wired or the relay throws) back
 *  into the sandbox runner. */
@@ -4052,6 +4548,9 @@ function relayChildIpcMessage(msg, dispatch, ctx) {
 		case "cache.request":
 			relayCacheRequest$1(msg, ctx);
 			return;
+		case "provenance.request":
+			relayProvenanceRequest$1(msg, ctx);
+			return;
 		case "approval.request":
 			relayApprovalRequest$1(msg, ctx);
 			return;
@@ -4476,6 +4975,32 @@ function relayCacheRequest(stream, options, cacheMsg) {
 	}));
 }
 /**
+* Relay provenance.request from the container runner to the orchestrator via
+* options.onProvenanceRequest, then write the response back through `stream`.
+* If the agent doesn't expose a provenance relay, write a structured error so
+* the runner doesn't hang.
+*/
+function relayProvenanceRequest(stream, options, provMsg) {
+	const writeResponse = (response) => {
+		try {
+			stream.write(JSON.stringify(response) + "\n");
+		} catch {}
+	};
+	if (!options.onProvenanceRequest) {
+		writeResponse({
+			type: "provenance.response",
+			requestId: provMsg.requestId,
+			error: "Provenance not available in this agent configuration"
+		});
+		return;
+	}
+	options.onProvenanceRequest(provMsg).then((response) => writeResponse(response), (err) => writeResponse({
+		type: "provenance.response",
+		requestId: provMsg.requestId,
+		error: toErrorMessage(err)
+	}));
+}
+/**
 * Relay approval.request from the container runner to the orchestrator via
 * options.onApprovalRequest, then write the resolution back through `stream`.
 * If the agent doesn't expose an approval relay (or it throws), write a
@@ -4758,6 +5283,9 @@ var init_container_sandbox = __esmMin((() => {
 				case "cache.request":
 					relayCacheRequest(stream, options, msg);
 					return false;
+				case "provenance.request":
+					relayProvenanceRequest(stream, options, msg);
+					return false;
 				case "approval.request":
 					relayApprovalRequest(stream, options, msg);
 					return false;
@@ -4857,7 +5385,7 @@ var job_runner_exports = /* @__PURE__ */ __exportAll({ JobRunner: () => JobRunne
 */
 async function fileExists(p) {
 	try {
-		await fs.access(p);
+		await fs$1.access(p);
 		return true;
 	} catch {
 		return false;
@@ -4899,6 +5427,14 @@ function determineExecutionMode(jobConfig, agentConfig) {
 	if (agentConfig.scalerManaged) return "firecracker";
 	return "bare-metal";
 }
+/**
+* Build the result-aware `ctx.needs` for a dynamic eval from its frozen upstream
+* snapshot. Returns undefined for an event-only generator (no snapshot).
+*/
+function buildEvalNeedsContext(config) {
+	if (!config.resultAware || !config.upstreamSnapshot) return void 0;
+	return buildNeedsContext(config.upstreamSnapshot, config.declaredNeeds ?? []);
+}
 var logger$2, JobRunner$1;
 var init_job_runner = __esmMin((() => {
 	init_git_clone();
@@ -4931,6 +5467,7 @@ var init_job_runner = __esmMin((() => {
 		_sendConcurrencyReport;
 		_sendApiRequest;
 		_requestUserCache;
+		_relayProvenance;
 		_sendStepApproval;
 		/** Tracks running jobs for concurrency and cancellation */
 		activeJobs = /* @__PURE__ */ new Map();
@@ -4950,6 +5487,7 @@ var init_job_runner = __esmMin((() => {
 			this._sendConcurrencyReport = deps.sendConcurrencyReport;
 			this._sendApiRequest = deps.sendApiRequest;
 			this._requestUserCache = deps.requestUserCache;
+			this._relayProvenance = deps.relayProvenance;
 			this._sendStepApproval = deps.sendStepApproval;
 		}
 		/**
@@ -4961,11 +5499,11 @@ var init_job_runner = __esmMin((() => {
 		async execute(dispatch) {
 			const { runId: _runId, jobId, jobConfig: _jobConfig } = dispatch;
 			const abortController = new AbortController();
-			const workDir = await fs.mkdtemp(join(tmpdir(), "kici-"));
+			const workDir = await fs$1.mkdtemp(join(tmpdir(), "kici-"));
 			const completionPromise = this.runJob(dispatch, workDir, abortController).finally(async () => {
 				this.activeJobs.delete(jobId);
 				this.activeSandbox = null;
-				await fs.rm(workDir, {
+				await fs$1.rm(workDir, {
 					recursive: true,
 					force: true
 				}).catch(() => {});
@@ -5190,6 +5728,7 @@ var init_job_runner = __esmMin((() => {
 				},
 				onApiRequest: this._sendApiRequest ? async (method, params) => this._sendApiRequest(method, params) : void 0,
 				onCacheRequest: this._requestUserCache ? async (request) => this._requestUserCache(jobId, request) : void 0,
+				onProvenanceRequest: this._relayProvenance ? async (request) => this._relayProvenance(jobId, request) : void 0,
 				onApprovalRequest: this._sendStepApproval ? async (request) => this._sendStepApproval(dispatch.runId, dispatch.jobId, request) : void 0,
 				onSecretMount: (event) => {
 					this.emitRunEvent(runId, "step.secret_mount", {
@@ -5509,11 +6048,12 @@ var init_job_runner = __esmMin((() => {
 				const initResult = await runCaptured(initSink, async () => {
 					const { module } = await loadWorkflowSource(workDir, config.source, config.contentHash, config.resolvedHashFiles);
 					const workflow = extractWorkflow(module, config.workflowName);
-					initLog(`Evaluating dynamic fields for job '${config.targetJobName}' (env=${config.dynamicEnv} environment=${config.dynamicEnvironment} concurrencyGroup=${config.dynamicConcurrencyGroup})`);
+					initLog(`Evaluating dynamic fields for job '${config.targetJobName}' (env=${config.dynamicEnv} environment=${config.dynamicEnvironment} concurrencyGroup=${config.dynamicConcurrencyGroup} matrix=${config.dynamicMatrix ?? false})`);
 					return evaluateDynamicFields(workflow, config.targetJobName, config.event, {
 						dynamicEnvironment: config.dynamicEnvironment,
 						dynamicEnv: config.dynamicEnv,
-						dynamicConcurrencyGroup: config.dynamicConcurrencyGroup
+						dynamicConcurrencyGroup: config.dynamicConcurrencyGroup,
+						dynamicMatrix: config.dynamicMatrix ?? false
 					}, config.timeoutMs);
 				});
 				logger$2.info("Init job completed successfully", {
@@ -5642,11 +6182,13 @@ var init_job_runner = __esmMin((() => {
 					const { extractDynamicJobFn } = await Promise.resolve().then(() => (init_workflow_loader(), workflow_loader_exports));
 					const dynamicFn = extractDynamicJobFn(extractWorkflow(module, config.workflowName), config.source.index);
 					evalLog(`Evaluating DynamicJobFn (index ${config.source.index}, timeout ${timeoutMs}ms)`);
+					const needs = buildEvalNeedsContext(config);
 					const context = {
 						$: scopedDollar,
 						ctx: {
 							workflow: { name: config.workflowName },
-							event: config.event
+							event: config.event,
+							...needs && { needs }
 						},
 						log: dynamicJobLogger,
 						env: process.env,
@@ -5863,14 +6405,14 @@ var init_job_runner = __esmMin((() => {
 */
 init_console_capture();
 init_npm_resolver();
-const AGENT_VERSION = "0.1.16";
-const BUILD_COMMIT = "7d97bb32c";
-const SDK_VERSION = "0.1.16";
-const SDK_BUNDLE_HASH = "cd4b8e0d91efe578c96e7c746f89b44a3df8fcaebaec2185399168ef8eb4ebca";
-const SHARED_VERSION = "0.1.16";
-const SHARED_BUNDLE_HASH = "c58b1596e92c8423ef83958e86894cb150315d8b91578a0080f1c645000e93e8";
-const ENGINE_VERSION = "0.1.16";
-const ENGINE_BUNDLE_HASH = "a611c0017d08faa9c5aa4fd97c3dd6259f53f3cca248bd2b369ad5d30c394847";
+const AGENT_VERSION = "0.1.18";
+const BUILD_COMMIT = "d8cff38bb";
+const SDK_VERSION = "0.1.18";
+const SDK_BUNDLE_HASH = "8308089347c304e41b457d3867b17bbff11d6b5cd9706b6823e7abdbd849f33f";
+const SHARED_VERSION = "0.1.18";
+const SHARED_BUNDLE_HASH = "5f2c220f24d166b0f13d0620a2e80d19689ac8b683a12154daef44e938fd46a7";
+const ENGINE_VERSION = "0.1.18";
+const ENGINE_BUNDLE_HASH = "79ce14640d1798eaaa7cb3aa6c4bc325da3bff1e9f4716936e19614eabb1d858";
 initTelemetry({
 	serviceName: "kici-agent",
 	otlpEndpoint: process.env.OTEL_EXPORTER_OTLP_ENDPOINT
@@ -5951,6 +6493,7 @@ await guardStartup(logger$1, async () => {
 		sendConcurrencyReport: (runId, jobId, group) => client.sendConcurrencyReport(runId, jobId, group),
 		sendApiRequest: (method, params) => client.sendApiRequest(method, params ?? {}),
 		requestUserCache: (jobId, request) => client.requestUserCache(jobId, request),
+		relayProvenance: (jobId, request) => client.relayProvenance(jobId, request),
 		sendStepApproval: (runId, jobId, request) => client.sendStepApproval(runId, jobId, request)
 	});
 	/** Build and send an agent.status message with dynamic OS metadata. */