@vitest-agent/engine 0.2.10 → 0.3.0

package/index.d.ts

@@ -1370,6 +1370,15 @@ export declare const OutputRendererLive: Layer.Layer<OutputRenderer, never, neve
  * @public
  */
 export declare const APP_NAMESPACE = "vitest-agent";
+/**
+ * Where the XDG data root lands when `XDG_DATA_HOME` is unset:
+ * `$HOME/.local/share/vitest-agent` — the XDG spec default. `AppDirs` alone
+ * would fall back to `$HOME/.vitest-agent`. Shared by `PathResolutionLive`
+ * (reporter/MCP route) and `resolveHookPaths` (hook/sidecar route) so both
+ * routes land in the same directory.
+ * @public
+ */
+export declare const DATA_FALLBACK_DIR = ".local/share/vitest-agent";
 /**
  * Composite layer providing every service `resolveDataPath` requires:
  * `AppDirs` (XDG path resolution), `VitestAgentConfigFile` (TOML
@@ -2418,6 +2427,21 @@ export interface SessionContext {
  * @public
  */
 export declare const parseSessionEnvExports: (content: string) => Record<string, string>;
+/**
+ * The synchronous filesystem reads {@link recoverSessionContextFromSessionEnv}
+ * performs. Each member throws on a missing or unreadable path, exactly as
+ * the `node:fs` call it stands in for; recovery treats a throw as "skip".
+ *
+ * @public
+ */
+export interface SessionEnvFileSystem {
+  /** Entry names directly under `path` (`readdirSync`). */
+  readonly readDirectory: (path: string) => ReadonlyArray<string>;
+  /** The UTF-8 text of the file at `path` (`readFileSync(path, "utf8")`). */
+  readonly readFile: (path: string) => string;
+  /** Modification time of the file at `path`, in epoch milliseconds (`statSync(path).mtimeMs`). */
+  readonly mtimeMs: (path: string) => number;
+}
 /**
  * Recover a {@link SessionContext} from the newest session-env hook file
  * whose `VITEST_AGENT_PROJECT_DIR` matches `projectDir`.
@@ -2431,12 +2455,15 @@ export declare const parseSessionEnvExports: (content: string) => Record<string,
  *
  * @param opts - `projectDir` to match against; `homeDir` is the caller's
  *   home directory (ambient input — the MCP bin passes `os.homedir()`),
- *   under which `.claude/session-env` is read
+ *   under which `.claude/session-env` is read; `fileSystem` replaces the
+ *   `node:fs` reads (tests pass an in-memory volume) and defaults to the
+ *   real disk
  * @public
  */
 export declare const recoverSessionContextFromSessionEnv: (opts: {
   readonly projectDir: string;
   readonly homeDir: string;
+  readonly fileSystem?: SessionEnvFileSystem;
 }) => SessionContext | null;
 //#endregion
 //#region src/project-dir.d.ts
@@ -2641,9 +2668,26 @@ export declare const resolveDataPath: (projectDir: string, options?: ResolveData
  * Always returns a non-empty string — falls back to the cwd basename
  * (or `"anonymous-project"`) so callers don't have to handle the
  * empty case.
+ *
+ * Synchronous and reads the real disk through `node:fs`; Effect callers
+ * that already hold a `FileSystem` use
+ * {@link resolveProjectKeyFromCwdEffect}, which applies the same rules.
  * @public
  */
 export declare const resolveProjectKeyFromCwd: (cwd: string) => string;
+/**
+ * {@link resolveProjectKeyFromCwd} read through the ambient
+ * `FileSystem` service instead of `node:fs` — same upward walk to the
+ * nearest `package.json`, same precedence, same basename fallback.
+ *
+ * Never fails: a filesystem error while probing or reading is treated like
+ * a missing or malformed `package.json`, exactly as the synchronous form
+ * does.
+ *
+ * @param cwd - Absolute directory to start the upward walk from.
+ * @public
+ */
+export declare const resolveProjectKeyFromCwdEffect: (cwd: string) => Effect.Effect<string, never, FileSystem.FileSystem>;
 //#endregion
 //#region src/utils/resolve-workspace-key.d.ts
 /**

package/index.js

@@ -22,7 +22,7 @@ import { LoggerLive, resolveLogFile, resolveLogLevel } from "./layers/LoggerLive
 import { OutputRenderer } from "./services/OutputRenderer.js";
 import { OutputRendererLive } from "./layers/OutputRendererLive.js";
 import { OutputPipelineLive } from "./layers/OutputPipelineLive.js";
-import { APP_NAMESPACE, PathResolutionLive } from "./layers/PathResolutionLive.js";
+import { APP_NAMESPACE, DATA_FALLBACK_DIR, PathResolutionLive } from "./layers/PathResolutionLive.js";
 import { PerClientSessionMapReader, PerClientSessionMapWriter } from "./services/PerClientSessionMap.js";
 import { PerClientSessionMapReaderLive, PerClientSessionMapWriterLive } from "./layers/PerClientSessionMapLive.js";
 import { ProjectDiscovery } from "./services/ProjectDiscovery.js";
@@ -55,9 +55,9 @@ import { resolveProjectDir } from "./project-dir.js";
 import { assembleHistoryRecord, assembleManifest } from "./sql/assemblers.js";
 import { _resetMigrationCacheForTesting, ensureMigrated } from "./utils/ensure-migrated.js";
 import { computeFailureSignature, normalizeAssertionShape } from "./utils/failure-signature.js";
-import { resolveProjectKeyFromCwd } from "./utils/resolve-project-key-from-cwd.js";
+import { resolveProjectKeyFromCwd, resolveProjectKeyFromCwdEffect } from "./utils/resolve-project-key-from-cwd.js";
 import { DATABASE_FILENAME, resolveDataPath } from "./utils/resolve-data-path.js";
 import { resolveWorkspaceKey } from "./utils/resolve-workspace-key.js";
 import { CURRENT_ENGINE_VERSION } from "./version.js";
 
-export { APP_NAMESPACE, AgentContext, CURRENT_ENGINE_VERSION, ConfigLive, DATABASE_FILENAME, DATA_DB_FILENAME, DataReader, DataReaderLive, DataStore, DataStoreLive, DetailResolver, DetailResolverLive, DiscoveryRegistry, DiscoveryRegistryLive, EnvironmentDetector, EnvironmentDetectorLive, EnvironmentDetectorTest, ExecutorResolver, ExecutorResolverLive, FormatSelector, FormatSelectorLive, HistoryTracker, HistoryTrackerLive, HistoryTrackerTest, IDEMPOTENCY_ROOT_SENTINEL, INLINE_ATTACHMENT_BODY_CAP_BYTES, LoggerLive, NodePlatformLayer, OutputPipelineLive, OutputRenderer, OutputRendererLive, PROJECT_MIGRATIONS, PathResolutionLive, PerClientSessionMapReader, PerClientSessionMapReaderLive, PerClientSessionMapWriter, PerClientSessionMapWriterLive, PlatformLive, ProjectDiscovery, ProjectDiscoveryLive, ProjectDiscoveryTest, ProjectIdentity, ProjectIdentityLive, ProjectIdentityTest, REGISTRY_DB_FILENAME, RunContext, RunContext$, RunContextLive, RunContextService, RunContextTest, SESSIONS_DB_FILENAME, SidecarPlatformLive, VitestAgentConfigFile, _resetMigrationCacheForTesting, assembleHistoryRecord, assembleManifest, classifyEnvironment, computeFailureSignature, deriveIdempotencyKey, dispatchRecordTddArtifactEffect, endAgentEffect, ensureMigrated, formatTriageEffect, formatWrapupEffect, historyKey, makeSqliteStack, migration as migration0001, migration$1 as migration0002, normalizeAssertionShape, parseAndValidateTurnPayload, parseSessionEnvExports, recordRunWorkspaceChangesEffect, recordSessionEnd, recordSessionStart, recordTddArtifactByTaskIdEffect, recordTddArtifactEffect, recordTurnEffect, recoverSessionContextFromSessionEnv, registerAgentEffect, migration$2 as registryMigration0001, resolveDataPath, resolveHookPaths, resolveLogFile, resolveLogLevel, resolveProjectDir, resolveProjectIdentityFromCandidates, resolveProjectKeyFromCwd, resolveSessionForRecording, resolveSessionMapPath, resolveWorkspaceKey, migration$3 as sessionMapMigration0001 };
+export { APP_NAMESPACE, AgentContext, CURRENT_ENGINE_VERSION, ConfigLive, DATABASE_FILENAME, DATA_DB_FILENAME, DATA_FALLBACK_DIR, DataReader, DataReaderLive, DataStore, DataStoreLive, DetailResolver, DetailResolverLive, DiscoveryRegistry, DiscoveryRegistryLive, EnvironmentDetector, EnvironmentDetectorLive, EnvironmentDetectorTest, ExecutorResolver, ExecutorResolverLive, FormatSelector, FormatSelectorLive, HistoryTracker, HistoryTrackerLive, HistoryTrackerTest, IDEMPOTENCY_ROOT_SENTINEL, INLINE_ATTACHMENT_BODY_CAP_BYTES, LoggerLive, NodePlatformLayer, OutputPipelineLive, OutputRenderer, OutputRendererLive, PROJECT_MIGRATIONS, PathResolutionLive, PerClientSessionMapReader, PerClientSessionMapReaderLive, PerClientSessionMapWriter, PerClientSessionMapWriterLive, PlatformLive, ProjectDiscovery, ProjectDiscoveryLive, ProjectDiscoveryTest, ProjectIdentity, ProjectIdentityLive, ProjectIdentityTest, REGISTRY_DB_FILENAME, RunContext, RunContext$, RunContextLive, RunContextService, RunContextTest, SESSIONS_DB_FILENAME, SidecarPlatformLive, VitestAgentConfigFile, _resetMigrationCacheForTesting, assembleHistoryRecord, assembleManifest, classifyEnvironment, computeFailureSignature, deriveIdempotencyKey, dispatchRecordTddArtifactEffect, endAgentEffect, ensureMigrated, formatTriageEffect, formatWrapupEffect, historyKey, makeSqliteStack, migration as migration0001, migration$1 as migration0002, normalizeAssertionShape, parseAndValidateTurnPayload, parseSessionEnvExports, recordRunWorkspaceChangesEffect, recordSessionEnd, recordSessionStart, recordTddArtifactByTaskIdEffect, recordTddArtifactEffect, recordTurnEffect, recoverSessionContextFromSessionEnv, registerAgentEffect, migration$2 as registryMigration0001, resolveDataPath, resolveHookPaths, resolveLogFile, resolveLogLevel, resolveProjectDir, resolveProjectIdentityFromCandidates, resolveProjectKeyFromCwd, resolveProjectKeyFromCwdEffect, resolveSessionForRecording, resolveSessionMapPath, resolveWorkspaceKey, migration$3 as sessionMapMigration0001 };

package/layers/DataReaderLive.js

@@ -606,14 +606,28 @@ const DataReaderLive = Layer.effect(DataReader, Effect.gen(function* () {
 		const runs = yield* sql`SELECT id FROM test_runs WHERE project = ${project} ORDER BY timestamp DESC LIMIT 1`;
 		return runs.length === 0 ? null : runs[0].id;
 	});
-	const attachmentsFor = (column, ownerId) => Effect.gen(function* () {
-		return (column === "annotation_id" ? yield* sql`SELECT content_type, path, body, body_encoding, byte_size FROM attachments WHERE annotation_id = ${ownerId} ORDER BY id` : yield* sql`SELECT content_type, path, body, body_encoding, byte_size FROM attachments WHERE artifact_id = ${ownerId} ORDER BY id`).map((r) => ({
-			...r.content_type !== null && { contentType: r.content_type },
-			...r.path !== null && { path: r.path },
-			...r.body !== null && { body: r.body },
-			...r.body_encoding !== null && { bodyEncoding: r.body_encoding },
-			byteSize: r.byte_size
-		}));
+	/**
+	* Load the attachments of every owner in `ownerIds` with a single query,
+	* grouped by owner id. Per-owner order follows `attachments.id`. An empty
+	* owner list issues no query.
+	*/
+	const attachmentsForMany = (column, ownerIds) => Effect.gen(function* () {
+		const grouped = /* @__PURE__ */ new Map();
+		if (ownerIds.length === 0) return grouped;
+		const rows = column === "annotation_id" ? yield* sql`SELECT annotation_id AS owner_id, content_type, path, body, body_encoding, byte_size FROM attachments WHERE annotation_id IN ${sql.in(ownerIds)} ORDER BY id` : yield* sql`SELECT artifact_id AS owner_id, content_type, path, body, body_encoding, byte_size FROM attachments WHERE artifact_id IN ${sql.in(ownerIds)} ORDER BY id`;
+		for (const r of rows) {
+			const attachment = {
+				...r.content_type !== null && { contentType: r.content_type },
+				...r.path !== null && { path: r.path },
+				...r.body !== null && { body: r.body },
+				...r.body_encoding !== null && { bodyEncoding: r.body_encoding },
+				byteSize: r.byte_size
+			};
+			const list = grouped.get(r.owner_id);
+			if (list === void 0) grouped.set(r.owner_id, [attachment]);
+			else list.push(attachment);
+		}
+		return grouped;
 	});
 	const getAnnotationsForTest = (project, fullName, options) => Effect.gen(function* () {
 		yield* Effect.logDebug("getAnnotationsForTest").pipe(Effect.annotateLogs({
@@ -631,9 +645,10 @@ const DataReaderLive = Layer.effect(DataReader, Effect.gen(function* () {
 					WHERE tm.run_id = ${runId} AND tc.full_name = ${fullName}
 						AND (${modulePath} IS NULL OR tm.relative_module_id = ${modulePath})
 					ORDER BY ta.id`;
+		const attachmentsByOwner = yield* attachmentsForMany("annotation_id", rows.map((r) => r.id));
 		const out = [];
 		for (const r of rows) {
-			const attachments = yield* attachmentsFor("annotation_id", r.id);
+			const attachments = attachmentsByOwner.get(r.id) ?? [];
 			out.push({
 				id: r.id,
 				type: r.type,
@@ -668,9 +683,10 @@ const DataReaderLive = Layer.effect(DataReader, Effect.gen(function* () {
 					WHERE tm.run_id = ${runId} AND tc.full_name = ${fullName}
 						AND (${modulePath} IS NULL OR tm.relative_module_id = ${modulePath})
 					ORDER BY ta.id`;
+		const attachmentsByOwner = yield* attachmentsForMany("artifact_id", rows.map((r) => r.id));
 		const out = [];
 		for (const r of rows) {
-			const attachments = yield* attachmentsFor("artifact_id", r.id);
+			const attachments = attachmentsByOwner.get(r.id) ?? [];
 			out.push({
 				id: r.id,
 				type: r.type,

package/layers/PathResolutionLive.js

@@ -11,12 +11,24 @@ import { AppDirs, Xdg } from "@effected/xdg";
 */
 const APP_NAMESPACE = "vitest-agent";
 /**
+* Where the XDG data root lands when `XDG_DATA_HOME` is unset:
+* `$HOME/.local/share/vitest-agent` — the XDG spec default. `AppDirs` alone
+* would fall back to `$HOME/.vitest-agent`. Shared by `PathResolutionLive`
+* (reporter/MCP route) and `resolveHookPaths` (hook/sidecar route) so both
+* routes land in the same directory.
+* @public
+*/
+const DATA_FALLBACK_DIR = `.local/share/${APP_NAMESPACE}`;
+/**
 * `AppDirs` over the ambient `Xdg` environment, bound to a `const` so the
 * layer memoizes by reference (calling `AppDirs.layer(...)` inline at two
 * provide sites would resolve two independent services). Requires
 * `FileSystem` + `Path` at the edge.
 */
-const AppDirsLive = AppDirs.layer({ namespace: APP_NAMESPACE }).pipe(Layer.provide(Xdg.layer));
+const AppDirsLive = AppDirs.layer({
+	namespace: APP_NAMESPACE,
+	fallbackDir: DATA_FALLBACK_DIR
+}).pipe(Layer.provide(Xdg.layer));
 /**
 * Composite layer providing every service `resolveDataPath` requires:
 * `AppDirs` (XDG path resolution), `VitestAgentConfigFile` (TOML
@@ -43,4 +55,4 @@ const PathResolutionLive = (projectDir) => {
 };
 
 //#endregion
-export { APP_NAMESPACE, PathResolutionLive };
+export { APP_NAMESPACE, DATA_FALLBACK_DIR, PathResolutionLive };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitest-agent/engine",
-	"version": "0.2.10",
+	"version": "0.3.0",
 	"private": false,
 	"description": "Shared services, layers, SQLite data layer, migrations and platform resolution for the vitest-agent CLI and MCP server.",
 	"keywords": [
@@ -42,14 +42,14 @@
 	"dependencies": {
 		"@effect/platform-node": "4.0.0-rc.118",
 		"@effect/sql-sqlite-node": "4.0.0-rc.118",
-		"@effected/config-file": "^0.13.0",
+		"@effected/config-file": "^0.13.1",
 		"@effected/engine": "^0.2.0",
 		"@effected/glob": "^0.9.0",
 		"@effected/jsonc": "^0.14.0",
 		"@effected/toml": "^0.10.0",
-		"@effected/walker": "^0.13.0",
-		"@effected/workspaces": "^0.30.1",
-		"@effected/xdg": "^0.8.0",
+		"@effected/walker": "^0.14.0",
+		"@effected/workspaces": "^0.30.2",
+		"@effected/xdg": "^0.8.1",
 		"@effected/yaml": "^0.18.0",
 		"@vitest-agent/sdk": "5.1.3",
 		"effect": "4.0.0-rc.118",

package/programs/hook-paths.js

@@ -1,4 +1,4 @@
-import { APP_NAMESPACE } from "../layers/PathResolutionLive.js";
+import { APP_NAMESPACE, DATA_FALLBACK_DIR } from "../layers/PathResolutionLive.js";
 import { ProjectIdentityNotResolvableError } from "@vitest-agent/sdk";
 import { ConfigProvider, Effect, FileSystem, Layer, Path } from "effect";
 import { AppDirs, Xdg } from "@effected/xdg";
@@ -22,12 +22,6 @@ const SESSIONS_DB_FILENAME = "sessions.db";
 * @public
 */
 const REGISTRY_DB_FILENAME = "registry.db";
-/**
-* Where the XDG data root lands when `XDG_DATA_HOME` is unset:
-* `$HOME/.local/share/vitest-agent` — the XDG spec default the sidecar has
-* always used. (`AppDirs` alone would fall back to `$HOME/.vitest-agent`.)
-*/
-const HOOK_DATA_FALLBACK_DIR = `.local/share/${APP_NAMESPACE}`;
 /** Directory under the home dir that holds the per-client `sessions.db` fallback. */
 const SESSION_MAP_HOME_DIR = `.${APP_NAMESPACE}`;
 const nonEmpty = (value) => value !== void 0 && value.length > 0 ? value : void 0;
@@ -48,7 +42,7 @@ const hookAppDirs = (env) => {
 	const XdgLive = Xdg.layer.pipe(Layer.provide(ConfigProvider.layer(provider)));
 	return AppDirs.layer({
 		namespace: APP_NAMESPACE,
-		fallbackDir: HOOK_DATA_FALLBACK_DIR
+		fallbackDir: DATA_FALLBACK_DIR
 	}).pipe(Layer.provide(XdgLive));
 };
 /**

package/programs/session-env.js

@@ -32,6 +32,12 @@ const parseSessionEnvExports = (content) => {
 	}
 	return out;
 };
+/** The default {@link SessionEnvFileSystem}: the real disk through `node:fs`. */
+const nodeSessionEnvFileSystem = {
+	readDirectory: (path) => readdirSync(path),
+	readFile: (path) => readFileSync(path, "utf8"),
+	mtimeMs: (path) => statSync(path).mtimeMs
+};
 /**
 * Recover a {@link SessionContext} from the newest session-env hook file
 * whose `VITEST_AGENT_PROJECT_DIR` matches `projectDir`.
@@ -45,15 +51,18 @@ const parseSessionEnvExports = (content) => {
 *
 * @param opts - `projectDir` to match against; `homeDir` is the caller's
 *   home directory (ambient input — the MCP bin passes `os.homedir()`),
-*   under which `.claude/session-env` is read
+*   under which `.claude/session-env` is read; `fileSystem` replaces the
+*   `node:fs` reads (tests pass an in-memory volume) and defaults to the
+*   real disk
 * @public
 */
 const recoverSessionContextFromSessionEnv = (opts) => {
+	const fs = opts.fileSystem ?? nodeSessionEnvFileSystem;
 	const root = join(opts.homeDir, ".claude", "session-env");
 	const wantDir = resolve(opts.projectDir);
 	let entries;
 	try {
-		entries = readdirSync(root);
+		entries = fs.readDirectory(root);
 	} catch {
 		return null;
 	}
@@ -61,15 +70,15 @@ const recoverSessionContextFromSessionEnv = (opts) => {
 	for (const entry of entries) {
 		const file = join(root, entry, "vitest-agent-hook.sh");
 		try {
-			const st = statSync(file);
-			const env = parseSessionEnvExports(readFileSync(file, "utf8"));
+			const mtimeMs = fs.mtimeMs(file);
+			const env = parseSessionEnvExports(fs.readFile(file));
 			const chatId = env.VITEST_AGENT_CHAT_ID;
 			const conversationId = env.VITEST_AGENT_CONVERSATION_ID;
 			const mainAgentId = env.VITEST_AGENT_MAIN_AGENT_ID ?? env.VITEST_AGENT_AGENT_ID;
 			const fileProjectDir = env.VITEST_AGENT_PROJECT_DIR;
 			if (chatId === void 0 || chatId.length === 0 || conversationId === void 0 || conversationId.length === 0 || mainAgentId === void 0 || mainAgentId.length === 0 || fileProjectDir === void 0 || resolve(fileProjectDir) !== wantDir) continue;
-			if (best === null || st.mtimeMs > best.mtimeMs) best = {
-				mtimeMs: st.mtimeMs,
+			if (best === null || mtimeMs > best.mtimeMs) best = {
+				mtimeMs,
 				ctx: {
 					chatId,
 					conversationId,

package/utils/resolve-data-path.js

@@ -1,5 +1,5 @@
 import { VitestAgentConfigFile } from "../services/Config.js";
-import { resolveProjectKeyFromCwd } from "./resolve-project-key-from-cwd.js";
+import { resolveProjectKeyFromCwdEffect } from "./resolve-project-key-from-cwd.js";
 import { VitestAgentConfig, normalizeWorkspaceKey } from "@vitest-agent/sdk";
 import { Effect, FileSystem } from "effect";
 import { AppDirs } from "@effected/xdg";
@@ -54,7 +54,7 @@ const resolveDataPath = (projectDir, options = {}) => Effect.gen(function* () {
 		return join(loaded.cacheDir, DATABASE_FILENAME);
 	}
 	const dataRoot = yield* (yield* AppDirs).ensureData;
-	const key = loaded.projectKey ? normalizeWorkspaceKey(loaded.projectKey) : resolveProjectKeyFromCwd(projectDir);
+	const key = loaded.projectKey ? normalizeWorkspaceKey(loaded.projectKey) : yield* resolveProjectKeyFromCwdEffect(projectDir);
 	const dir = join(dataRoot, key);
 	yield* fs.makeDirectory(dir, { recursive: true });
 	return join(dir, DATABASE_FILENAME);

package/utils/resolve-project-key-from-cwd.js

@@ -1,4 +1,5 @@
 import { gitUrlToProjectKey, normalizeWorkspaceKey } from "@vitest-agent/sdk";
+import { Effect, FileSystem } from "effect";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 
@@ -24,6 +25,27 @@ const readRepositoryUrl = (parsed) => {
 	return null;
 };
 /**
+* The key a `package.json` body names: the canonical `host__path` form of
+* `repository.url` when present and canonicalizable, else the normalized
+* `name`, else `null` (no usable field, or malformed JSON).
+*/
+const keyFromPackageJson = (content) => {
+	try {
+		const parsed = JSON.parse(content);
+		const repoUrl = readRepositoryUrl(parsed);
+		if (repoUrl !== null) {
+			const key = gitUrlToProjectKey(repoUrl);
+			if (key !== null) return key;
+		}
+		if (typeof parsed.name === "string" && parsed.name.length > 0) return normalizeWorkspaceKey(parsed.name);
+	} catch {}
+	return null;
+};
+const basenameKey = (cwd) => {
+	const basename = cwd.split("/").filter((segment) => segment.length > 0).pop() ?? "anonymous-project";
+	return normalizeWorkspaceKey(basename);
+};
+/**
 * Compute the project key for a workspace by reading `package.json`
 * fields directly. Returns the canonical `host__path` form when a git
 * remote URL is present, otherwise the normalized package name.
@@ -31,22 +53,50 @@ const readRepositoryUrl = (parsed) => {
 * Always returns a non-empty string — falls back to the cwd basename
 * (or `"anonymous-project"`) so callers don't have to handle the
 * empty case.
+*
+* Synchronous and reads the real disk through `node:fs`; Effect callers
+* that already hold a `FileSystem` use
+* {@link resolveProjectKeyFromCwdEffect}, which applies the same rules.
 * @public
 */
 const resolveProjectKeyFromCwd = (cwd) => {
 	const pkgPath = findNearestPackageJson(cwd);
-	if (pkgPath !== null) try {
-		const parsed = JSON.parse(readFileSync(pkgPath, "utf-8"));
-		const repoUrl = readRepositoryUrl(parsed);
-		if (repoUrl !== null) {
-			const key = gitUrlToProjectKey(repoUrl);
-			if (key !== null) return key;
-		}
-		if (typeof parsed.name === "string" && parsed.name.length > 0) return normalizeWorkspaceKey(parsed.name);
-	} catch {}
-	const basename = cwd.split("/").filter((segment) => segment.length > 0).pop() ?? "anonymous-project";
-	return normalizeWorkspaceKey(basename);
+	if (pkgPath !== null) {
+		let content = null;
+		try {
+			content = readFileSync(pkgPath, "utf-8");
+		} catch {}
+		const key = content === null ? null : keyFromPackageJson(content);
+		if (key !== null) return key;
+	}
+	return basenameKey(cwd);
 };
+/**
+* {@link resolveProjectKeyFromCwd} read through the ambient
+* `FileSystem` service instead of `node:fs` — same upward walk to the
+* nearest `package.json`, same precedence, same basename fallback.
+*
+* Never fails: a filesystem error while probing or reading is treated like
+* a missing or malformed `package.json`, exactly as the synchronous form
+* does.
+*
+* @param cwd - Absolute directory to start the upward walk from.
+* @public
+*/
+const resolveProjectKeyFromCwdEffect = (cwd) => Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
+	let dir = cwd;
+	while (true) {
+		const candidate = join(dir, PACKAGE_JSON);
+		if (yield* fs.exists(candidate).pipe(Effect.orElseSucceed(() => false))) {
+			const content = yield* fs.readFileString(candidate).pipe(Effect.orElseSucceed(() => null));
+			return (content === null ? null : keyFromPackageJson(content)) ?? basenameKey(cwd);
+		}
+		const parent = dirname(dir);
+		if (parent === dir) return basenameKey(cwd);
+		dir = parent;
+	}
+});
 
 //#endregion
-export { resolveProjectKeyFromCwd };
+export { resolveProjectKeyFromCwd, resolveProjectKeyFromCwdEffect };

package/version.js

@@ -1,6 +1,6 @@
 //#region src/version.ts
 /** Build-time injected package version (see architecture.md D36). @public */
-const CURRENT_ENGINE_VERSION = "0.2.10";
+const CURRENT_ENGINE_VERSION = "0.3.0";
 
 //#endregion
 export { CURRENT_ENGINE_VERSION };