@kici-dev/agent 0.1.17 → 0.1.18

package/dist/server.js

@@ -15,7 +15,7 @@ import { LOGGER_ENV_VARS, defineEnv, validateUnknownKiciVars } from "@kici-dev/s
 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";
@@ -24,13 +24,15 @@ import { format, promisify } from "node:util";
 import { gcStaleTmpDirs } from "@kici-dev/core/tmp-gc";
 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) => {
@@ -1297,14 +1299,14 @@ var init_console_capture = __esmMin((() => {
 init_console_capture();
 function safe(name, fallback = "unknown") {
 	switch (name) {
-		case "version": return "0.1.17";
-		case "buildCommit": return "5596f8a3c";
-		case "sdkVersion": return "0.1.17";
-		case "sdkBundleHash": return "df47ed5db86eaaa2de8394c0db08335f368e8d620a898cc409765f4545eb3972";
-		case "sharedVersion": return "0.1.17";
-		case "sharedBundleHash": return "9e8a753da73b26fb87d08817f70b4d836f67f599385fa268b2c1f68b97996f54";
-		case "engineVersion": return "0.1.17";
-		case "engineBundleHash": return "706d94fa54a47aea0f69bde105d40213befff401f717604aded2c62a1291cb51";
+		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;
 	}
 }
@@ -1949,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,
@@ -1988,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.17";
-	AGENT_SDK_BUNDLE_HASH = "df47ed5db86eaaa2de8394c0db08335f368e8d620a898cc409765f4545eb3972";
+	AGENT_SDK_VERSION = "0.1.18";
+	AGENT_SDK_BUNDLE_HASH = "8308089347c304e41b457d3867b17bbff11d6b5cd9706b6823e7abdbd849f33f";
 	hookRegistered = false;
 }));
 //#endregion
@@ -2496,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}'`);
@@ -2519,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),
@@ -2533,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.
@@ -2632,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,
@@ -3059,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. */
@@ -3068,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}`);
@@ -3100,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);
@@ -3138,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.
@@ -3158,8 +3255,10 @@ var init_npm_registry_config = __esmMin((() => {}));
 * - 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 is not yet
-*   supported.)
+*   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.
@@ -3219,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);
@@ -3233,8 +3343,20 @@ 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) {
@@ -3258,10 +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) 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 is planned.)`;
+	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.`;
 }
 /**
@@ -3275,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((() => {
@@ -3402,10 +3526,13 @@ var init_workspace_siblings = __esmMin((() => {}));
 * 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 classic (v1) is supported for registry
-* dependencies and version-range workspace siblings (which it links but does
-* not build, so the agent builds the in-repo closure after install). yarn
-* berry (v2+) is not yet supported.
+* `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
@@ -3426,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.
@@ -3444,19 +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`);
+	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,
@@ -3468,6 +3613,10 @@ async function installDeps(kiciDir, opts = {}) {
 			hasPrivateRegistry,
 			registryConfig
 		});
+		else if (isBerry) await runYarnBerryInstall({
+			kiciDir,
+			registryConfig
+		});
 		else if (packageManager === PackageManager.Yarn) await runYarnInstall({
 			kiciDir,
 			hasPrivateRegistry,
@@ -3487,7 +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);
+	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", {
@@ -3616,6 +3765,35 @@ async function runYarnInstall(args) {
 		}).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 {
@@ -3635,7 +3813,7 @@ async function assertYarnAvailable() {
 * Deep cross-sibling build chains may build out of strict topological order —
 * real `.kici` closures are shallow.
 */
-async function buildYarnWorkspaceClosure(repoRoot, kiciDir) {
+async function buildYarnWorkspaceClosure(repoRoot, kiciDir, yarnFlavor) {
 	const siblings = await collectInRepoSiblings(repoRoot, kiciDir, resolveYarnNodeModulesRoot(repoRoot, kiciDir));
 	if (siblings.length === 0) return;
 	const { nodeDir } = resolveNpm();
@@ -3643,15 +3821,16 @@ async function buildYarnWorkspaceClosure(repoRoot, kiciDir) {
 	for (const rel of [...siblings].reverse()) {
 		const sibDir = join(repoRoot, rel);
 		if (!await siblingHasBuildScript(sibDir)) continue;
-		process.stderr.write(`[dep-installer:trace] building yarn sibling: yarn --cwd ${sibDir} run build\n`);
+		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", [
-				"--cwd",
-				sibDir,
-				"run",
-				"build"
-			], {
-				cwd: repoRoot,
+			await execFileAsync("yarn", argv, {
+				cwd,
 				env,
 				timeout: INSTALL_TIMEOUT_MS,
 				maxBuffer: INSTALL_MAX_BUFFER
@@ -3729,6 +3908,7 @@ 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" });
@@ -3753,11 +3933,14 @@ var init_dep_installer = __esmMin((() => {
 *   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: the resolved node_modules root (standalone `.kici` →
-*   `.kici/node_modules`; hoisted workspace member → the repo-root
-*   `node_modules`) plus the in-repo version-range sibling package directories
-*   `.kici` depends on (with their built output), whose symlinks would dangle
-*   otherwise.
+* - 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
@@ -3805,10 +3988,11 @@ async function packNodeModules(kiciDir) {
 /**
 * 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 packs the
-* resolved node_modules root (standalone → `.kici/node_modules`; hoisted
-* workspace member → root `node_modules`) plus the in-repo version-range
-* siblings, which it links but does not place in the store.
+* 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) {
 	if (packageManager === PackageManager.Pnpm) {
@@ -3988,6 +4172,8 @@ function buildRequest(dispatch, workDir) {
 		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,
@@ -5241,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();
@@ -5988,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,
@@ -6209,14 +6405,14 @@ var init_job_runner = __esmMin((() => {
 */
 init_console_capture();
 init_npm_resolver();
-const AGENT_VERSION = "0.1.17";
-const BUILD_COMMIT = "5596f8a3c";
-const SDK_VERSION = "0.1.17";
-const SDK_BUNDLE_HASH = "df47ed5db86eaaa2de8394c0db08335f368e8d620a898cc409765f4545eb3972";
-const SHARED_VERSION = "0.1.17";
-const SHARED_BUNDLE_HASH = "9e8a753da73b26fb87d08817f70b4d836f67f599385fa268b2c1f68b97996f54";
-const ENGINE_VERSION = "0.1.17";
-const ENGINE_BUNDLE_HASH = "706d94fa54a47aea0f69bde105d40213befff401f717604aded2c62a1291cb51";
+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