ryco-cli 0.1.24 → 0.1.25

package/dist/bin.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-LGfotAqq.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-DStwNTTK.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-whblCEfg.cjs");
 const require_Metrics = require("./Metrics-Bcb9vCAe.cjs");
-const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DreaAH1H.cjs");
+const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-Dm_lhrhv.cjs");
 const require_sourceControl = require("./sourceControl-B0D1Op29.cjs");
 let _effect_platform_node_NodeRuntime = require("@effect/platform-node/NodeRuntime");
 _effect_platform_node_NodeRuntime = require_rolldown_runtime.__toESM(_effect_platform_node_NodeRuntime, 1);
@@ -1408,6 +1408,7 @@ function logPathHydrationWarning(message, error) {
 	console.warn(`[server] ${message}`, error instanceof Error ? error.message : error ?? "");
 }
 function fixPath(options = {}) {
+	if (options.inheritedFromDesktop) return;
 	const platform = options.platform ?? process.platform;
 	const env = options.env ?? process.env;
 	const logWarning = options.logWarning ?? logPathHydrationWarning;
@@ -6576,8 +6577,35 @@ const repairProjectionThreadSubagentNestingColumns = effect_Effect.fn("repairPro
 const repairContextHandoffRuntimeSessions = effect_Effect.fn("repairContextHandoffRuntimeSessions")(function* () {
 	yield* _042_ContextHandoffRuntimeSessions_default;
 });
+const repairProjectionThreadSummaryState = effect_Effect.gen(function* () {
+	const sql = yield* effect_unstable_sql_SqlClient.SqlClient;
+	yield* sql`
+    CREATE TABLE IF NOT EXISTS ryco_compatibility_repairs (
+      repair_key TEXT PRIMARY KEY
+    )
+  `;
+	yield* sql.withTransaction(effect_Effect.gen(function* () {
+		const completed = yield* sql`
+      SELECT repair_key FROM ryco_compatibility_repairs
+      WHERE repair_key = 'projection-thread-summary-v1'
+    `;
+		const objects = yield* sql`
+      SELECT name FROM sqlite_master WHERE name IN (
+        'projection_thread_user_input_requests',
+        'idx_projection_thread_user_input_requests_thread_pending',
+        'idx_projection_thread_proposed_plans_thread_turn_updated'
+      )
+    `;
+		if (completed.length > 0 && objects.length === 3) return;
+		yield* _044_ProjectionThreadSummaryState_default;
+		yield* sql`
+      INSERT OR IGNORE INTO ryco_compatibility_repairs (repair_key)
+      VALUES ('projection-thread-summary-v1')
+    `;
+	}));
+});
 const repairProjectionThreadReadModelMigrations = effect_Effect.fn("repairProjectionThreadReadModelMigrations")(function* (toMigrationInclusive) {
-	if (toMigrationInclusive >= 44) yield* _044_ProjectionThreadSummaryState_default;
+	if (toMigrationInclusive >= 44) yield* repairProjectionThreadSummaryState;
 	if (toMigrationInclusive >= 45) yield* _045_ProjectionThreadHistoryPaginationIndexes_default;
 	if (toMigrationInclusive >= 46) yield* _046_ProjectionThreadMessageDispatchMode_default;
 	if (toMigrationInclusive >= 47) yield* _047_ProjectionThreadsGoal_default;
@@ -13507,26 +13535,26 @@ const make$13 = effect.Effect.fn("makeSourceControlProviderRegistry")(function*
 	const azureDevOpsCli = yield* AzureDevOpsCli;
 	const fileSystem = yield* effect.FileSystem.FileSystem;
 	const github = yield* makeLazyProvider("github", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./GitHubSourceControlProvider-8hsv_kCE.cjs")),
+		try: () => Promise.resolve().then(() => require("./GitHubSourceControlProvider-CItCpOcC.cjs")),
 		catch: (cause) => providerLoadError("github", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(GitHubCli, githubCli), effect.Effect.provideService(effect.FileSystem.FileSystem, fileSystem)));
 	const gitlab = yield* makeLazyProvider("gitlab", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./GitLabSourceControlProvider-B0ZbF9Zx.cjs")),
+		try: () => Promise.resolve().then(() => require("./GitLabSourceControlProvider-CMce22nU.cjs")),
 		catch: (cause) => providerLoadError("gitlab", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(GitLabCli, gitlabCli)));
 	const bitbucket = yield* makeLazyProvider("bitbucket", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./BitbucketSourceControlProvider-BzhsQwH-.cjs")),
+		try: () => Promise.resolve().then(() => require("./BitbucketSourceControlProvider-CD8IvXQK.cjs")),
 		catch: (cause) => providerLoadError("bitbucket", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(BitbucketApi, bitbucketApi)), {
 		searchRepositories: true,
 		cloneAuthentication: true
 	});
 	const forgejo = yield* makeLazyProvider("forgejo", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./ForgejoSourceControlProvider-Dh6DOoc8.cjs")),
+		try: () => Promise.resolve().then(() => require("./ForgejoSourceControlProvider-JgiyrMqp.cjs")),
 		catch: (cause) => providerLoadError("forgejo", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(ForgejoApi, forgejoApi)));
 	const azureDevOps = yield* makeLazyProvider("azure-devops", effect.Effect.tryPromise({
-		try: () => Promise.resolve().then(() => require("./AzureDevOpsSourceControlProvider-CrvgKNf2.cjs")),
+		try: () => Promise.resolve().then(() => require("./AzureDevOpsSourceControlProvider-COmd21c-.cjs")),
 		catch: (cause) => providerLoadError("azure-devops", cause)
 	}).pipe(effect.Effect.flatMap((module) => module.make()), effect.Effect.provideService(AzureDevOpsCli, azureDevOpsCli)));
 	const bitbucketDiscovery = require_SourceControlProviderDiscoveryCatalog.makeBitbucketDiscovery(bitbucketApi);
@@ -34015,7 +34043,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.CodexSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.CodexSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./CodexDriver-CR0S17Lb.cjs")),
+			try: () => Promise.resolve().then(() => require("./CodexDriver-BzR8gA8w.cjs")),
 			catch: (cause) => driverImportError(codexDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CodexDriver }) => CodexDriver.create(input)))
 	},
@@ -34029,7 +34057,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.ClaudeSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.ClaudeSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./ClaudeDriver-B7mbf51W.cjs")),
+			try: () => Promise.resolve().then(() => require("./ClaudeDriver-Dry5uJfX.cjs")),
 			catch: (cause) => driverImportError(claudeDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ ClaudeDriver }) => ClaudeDriver.create(input)))
 	},
@@ -34043,7 +34071,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.CopilotSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.CopilotSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./CopilotDriver-IBd27Ji2.cjs")),
+			try: () => Promise.resolve().then(() => require("./CopilotDriver-rLcA8PSN.cjs")),
 			catch: (cause) => driverImportError(copilotDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CopilotDriver }) => CopilotDriver.create(input)))
 	},
@@ -34057,7 +34085,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.CursorSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.CursorSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./CursorDriver-C4Enoe9N.cjs")),
+			try: () => Promise.resolve().then(() => require("./CursorDriver-C3s-8s9F.cjs")),
 			catch: (cause) => driverImportError(cursorDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CursorDriver }) => CursorDriver.create(input)))
 	},
@@ -34071,7 +34099,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.GrokSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.GrokSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./GrokDriver-RyyFeh_q.cjs")),
+			try: () => Promise.resolve().then(() => require("./GrokDriver-D0jraOC_.cjs")),
 			catch: (cause) => driverImportError(grokDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ GrokDriver }) => GrokDriver.create(input)))
 	},
@@ -34085,7 +34113,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: require_collectUint8StreamText.OpenCodeSettings,
 		defaultConfig: () => effect.Schema.decodeSync(require_collectUint8StreamText.OpenCodeSettings)({}),
 		create: (input) => effect.Effect.tryPromise({
-			try: () => Promise.resolve().then(() => require("./OpenCodeDriver-CDcvPT9v.cjs")),
+			try: () => Promise.resolve().then(() => require("./OpenCodeDriver-DxGpgtDS.cjs")),
 			catch: (cause) => driverImportError(openCodeDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ OpenCodeDriver }) => OpenCodeDriver.create(input)))
 	}
@@ -34800,7 +34828,7 @@ const scopedSafeTeardown = (label) => (effect$28) => effect.Effect.gen(function*
 });
 //#endregion
 //#region package.json
-var version$1 = "0.1.24";
+var version$1 = "0.1.25";
 //#endregion
 //#region src/provider/Layers/CodexProvider.ts
 const PROVIDER_PROBE_TIMEOUT_MS = 8e3;
@@ -43385,6 +43413,36 @@ function resolveWorktreeCheckoutPath(input) {
 	return resolveAppManagedWorktreeCheckoutPath(input.appWorktreesRoot, input.projectId, input.branchName);
 }
 //#endregion
+//#region src/persistence/Services/ProjectionProjects.ts
+/**
+* ProjectionProjectRepository - Projection repository interface for projects.
+*
+* Owns persistence operations for project rows in the orchestration projection
+* read model.
+*
+* @module ProjectionProjectRepository
+*/
+const ProjectionProject = effect.Schema.Struct({
+	projectId: require_collectUint8StreamText.ProjectId,
+	title: effect.Schema.String,
+	workspaceRoot: effect.Schema.String,
+	projectMetadataDir: require_collectUint8StreamText.ProjectMetadataDir,
+	defaultModelSelection: effect.Schema.NullOr(require_collectUint8StreamText.ModelSelection),
+	customSystemPrompt: effect.Schema.optional(effect.Schema.NullOr(effect.Schema.String)),
+	customAvatarContentHash: effect.Schema.NullOr(effect.Schema.String),
+	preferredRemoteName: effect.Schema.NullOr(effect.Schema.String),
+	scripts: effect.Schema.Array(require_collectUint8StreamText.ProjectScript),
+	createdAt: require_collectUint8StreamText.IsoDateTime,
+	updatedAt: require_collectUint8StreamText.IsoDateTime,
+	deletedAt: effect.Schema.NullOr(require_collectUint8StreamText.IsoDateTime)
+});
+const GetProjectionProjectInput = effect.Schema.Struct({ projectId: require_collectUint8StreamText.ProjectId });
+const DeleteProjectionProjectInput = effect.Schema.Struct({ projectId: require_collectUint8StreamText.ProjectId });
+/**
+* ProjectionProjectRepository - Service tag for project projection persistence.
+*/
+var ProjectionProjectRepository = class extends effect.Context.Service()("ryco/persistence/Services/ProjectionProjects/ProjectionProjectRepository") {};
+//#endregion
 //#region src/persistence/Services/ProjectionWorktrees.ts
 /**
 * ProjectionWorktreeRepository - Projection repository interface for worktrees.
@@ -44681,6 +44739,7 @@ const RPC_ACCESS_POLICY = {
 	[require_collectUint8StreamText.WS_METHODS.projectsList]: "viewer",
 	[require_collectUint8StreamText.WS_METHODS.projectsListEntries]: "operator",
 	[require_collectUint8StreamText.WS_METHODS.projectsReadFile]: "operator",
+	[require_collectUint8StreamText.WS_METHODS.projectsReadIcon]: "viewer",
 	[require_collectUint8StreamText.WS_METHODS.projectsReadFileBinary]: "operator",
 	[require_collectUint8StreamText.WS_METHODS.projectsRemove]: "operator",
 	[require_collectUint8StreamText.WS_METHODS.projectsSearchEntries]: "operator",
@@ -46596,6 +46655,9 @@ const makeWsRpcContext = (principal) => effect.Effect.gen(function* () {
 		openCodeMcp
 	]);
 	const startup = yield* ServerRuntimeStartup;
+	const projectionProjects = yield* effect.Effect.serviceOption(ProjectionProjectRepository);
+	const projectFaviconResolver = yield* effect.Effect.serviceOption(ProjectFaviconResolver);
+	const projectAvatarStore = yield* effect.Effect.serviceOption(ProjectAvatarStore);
 	const workspaceEntries = yield* WorkspaceEntries;
 	const workspaceFileSystem = yield* WorkspaceFileSystem;
 	const workspaceAccessPolicy = yield* WorkspaceAccessPolicy;
@@ -46971,6 +47033,9 @@ const makeWsRpcContext = (principal) => effect.Effect.gen(function* () {
 		lifecycleEvents,
 		serverSettings,
 		mcpRegistry,
+		projectionProjects,
+		projectFaviconResolver,
+		projectAvatarStore,
 		workspaceEntries,
 		workspaceFileSystem,
 		sourceControlDiscovery,
@@ -48118,10 +48183,51 @@ const makeTerminalHandlers = (ctx) => {
 	});
 };
 //#endregion
+//#region src/project/readProjectIcon.ts
+const iconTypes = {
+	".png": "image/png",
+	".jpg": "image/jpeg",
+	".jpeg": "image/jpeg",
+	".webp": "image/webp",
+	".svg": "image/svg+xml",
+	".ico": "image/x-icon"
+};
+/** Resolve only the registered project's artwork; callers cannot supply filesystem paths. */
+function readProjectIcon(project, services) {
+	return effect.Effect.gen(function* () {
+		if (project.customAvatarContentHash && services.avatar) {
+			const avatar = yield* services.avatar.read(project.id);
+			if (avatar && avatar.bytes.length <= 524288) return {
+				mimeType: "image/png",
+				dataBase64: avatar.bytes.toString("base64")
+			};
+		}
+		const icon = services.favicon ? yield* services.favicon.readIcon(project.workspaceRoot) : null;
+		if (!icon || icon.bytes.length > 524288) return null;
+		const mimeType = iconTypes[(0, node_path.extname)(icon.path).toLowerCase()];
+		return mimeType ? {
+			mimeType,
+			dataBase64: Buffer.from(icon.bytes).toString("base64")
+		} : null;
+	});
+}
+//#endregion
 //#region src/ws/projectRpc.ts
 const makeProjectHandlers = (ctx) => {
 	const { ownerEffect, workspaceEntries, workspaceFileSystem, open } = ctx;
 	return defineWsHandlers({
+		[require_collectUint8StreamText.WS_METHODS.projectsReadIcon]: (input) => ctx.withAccess("viewer", require_collectUint8StreamText.WS_METHODS.projectsReadIcon, effect.Effect.gen(function* () {
+			if (effect.Option.isNone(ctx.projectionProjects)) return null;
+			const project = yield* ctx.projectionProjects.value.getById(input).pipe(effect.Effect.mapError(() => new require_collectUint8StreamText.ProjectReadIconError({ message: "Could not load project artwork." })));
+			if (effect.Option.isNone(project) || project.value.deletedAt !== null) return null;
+			return yield* readProjectIcon({
+				...project.value,
+				id: project.value.projectId
+			}, {
+				favicon: effect.Option.getOrNull(ctx.projectFaviconResolver),
+				avatar: effect.Option.getOrNull(ctx.projectAvatarStore)
+			});
+		})),
 		[require_collectUint8StreamText.WS_METHODS.projectsSearchEntries]: (input) => observeRpcEffect(require_collectUint8StreamText.WS_METHODS.projectsSearchEntries, ownerEffect(require_collectUint8StreamText.WS_METHODS.projectsSearchEntries, workspaceEntries.search(input).pipe(effect.Effect.mapError((cause) => new require_collectUint8StreamText.ProjectSearchEntriesError({
 			message: `Failed to search workspace entries: ${cause.detail}`,
 			cause
@@ -69830,7 +69936,7 @@ function makeNodeNativeClaimService(options) {
 				claim: input.claim,
 				requireCurrent: true
 			});
-			if (input.result.status !== "claimed" || input.result.node.environmentId !== input.claim.environmentId || input.result.node.fingerprint !== input.claim.nodeFingerprint || input.result.node.label !== expectedLabel || input.result.node.effectiveRole !== "owner") return claimError("native_node_claim_conflict");
+			if (input.result.status !== "claimed" || input.result.node.environmentId !== input.claim.environmentId || input.result.node.fingerprint !== input.claim.nodeFingerprint || input.result.node.label !== expectedLabel && !(validated.descriptor.state === "active" && input.result.disposition === "reconnected") || input.result.node.effectiveRole !== "owner") return claimError("native_node_claim_conflict");
 			const active = {
 				hubOrigin: validated.descriptor.hubOrigin,
 				nodeId: input.result.node.id,
@@ -89993,22 +90099,25 @@ function buildRepositoryIdentity(input) {
 const DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY = 512;
 const DEFAULT_POSITIVE_CACHE_TTL = effect.Duration.minutes(1);
 const DEFAULT_NEGATIVE_CACHE_TTL = effect.Duration.minutes(1);
+const GIT_IDENTITY_PROBE_TIMEOUT_MS = 1e3;
 async function resolveRepositoryIdentityCacheKey(cwd) {
-	let cacheKey = cwd;
 	try {
 		const topLevelResult = await runProcess("git", [
 			"-C",
 			cwd,
 			"rev-parse",
 			"--show-toplevel"
-		], { allowNonZeroExit: true });
-		if (topLevelResult.code !== 0) return cacheKey;
+		], {
+			allowNonZeroExit: true,
+			timeoutMs: GIT_IDENTITY_PROBE_TIMEOUT_MS
+		});
+		if (topLevelResult.timedOut || topLevelResult.code !== 0) return null;
 		const candidate = topLevelResult.stdout.trim();
-		if (candidate.length > 0) cacheKey = candidate;
+		if (candidate.length > 0) return candidate;
 	} catch {
-		return cacheKey;
+		return null;
 	}
-	return cacheKey;
+	return null;
 }
 async function resolveRepositoryIdentityFromCacheKey(cacheKey) {
 	try {
@@ -90017,8 +90126,11 @@ async function resolveRepositoryIdentityFromCacheKey(cacheKey) {
 			cacheKey,
 			"remote",
 			"-v"
-		], { allowNonZeroExit: true });
-		if (remoteResult.code !== 0) return null;
+		], {
+			allowNonZeroExit: true,
+			timeoutMs: GIT_IDENTITY_PROBE_TIMEOUT_MS
+		});
+		if (remoteResult.timedOut || remoteResult.code !== 0) return null;
 		const allRemotes = parseRemoteFetchUrls(remoteResult.stdout);
 		const remote = pickPrimaryRemote(allRemotes);
 		return remote ? buildRepositoryIdentity({
@@ -90031,6 +90143,13 @@ async function resolveRepositoryIdentityFromCacheKey(cacheKey) {
 	}
 }
 const makeRepositoryIdentityResolver = effect.Effect.fn("makeRepositoryIdentityResolver")(function* (options = {}) {
+	const workspaceRootCache = yield* effect.Cache.makeWith((cwd) => effect.Effect.promise(() => resolveRepositoryIdentityCacheKey(cwd)), {
+		capacity: options.cacheCapacity ?? DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY,
+		timeToLive: effect.Exit.match({
+			onSuccess: (value) => value === null ? options.negativeCacheTtl ?? DEFAULT_NEGATIVE_CACHE_TTL : options.positiveCacheTtl ?? DEFAULT_POSITIVE_CACHE_TTL,
+			onFailure: () => effect.Duration.zero
+		})
+	});
 	const repositoryIdentityCache = yield* effect.Cache.makeWith((cacheKey) => effect.Effect.promise(() => resolveRepositoryIdentityFromCacheKey(cacheKey)), {
 		capacity: options.cacheCapacity ?? DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY,
 		timeToLive: effect.Exit.match({
@@ -90039,7 +90158,8 @@ const makeRepositoryIdentityResolver = effect.Effect.fn("makeRepositoryIdentityR
 		})
 	});
 	return { resolve: effect.Effect.fn("RepositoryIdentityResolver.resolve")(function* (cwd) {
-		const cacheKey = yield* effect.Effect.promise(() => resolveRepositoryIdentityCacheKey(cwd));
+		const cacheKey = yield* effect.Cache.get(workspaceRootCache, cwd);
+		if (cacheKey === null) return null;
 		return yield* effect.Cache.get(repositoryIdentityCache, cacheKey);
 	}) };
 });
@@ -92380,6 +92500,20 @@ const resolveServerEnvironmentLabel = effect.Effect.fn("resolveServerEnvironment
 	return normalizeLabel(input.cwdBaseName) ?? "Ryco environment";
 });
 //#endregion
+//#region ../../packages/shared/src/environmentIcon.ts
+/** Reuse existing platform/name metadata; icon selection must never probe permissions or delay startup. */
+function inferEnvironmentMachineKind(platform, label = "") {
+	const name = label.toLowerCase().replaceAll(/[\s_-]+/g, "");
+	if (/macmini|minipc/.test(name)) return "mini-pc";
+	if (/macstudio|workstation/.test(name)) return "workstation";
+	if (/macbook|notebook|laptop/.test(name)) return "laptop";
+	if (/imac|macpro|desktop/.test(name)) return "desktop";
+	if (platform === "windows" || platform === "win32") return "windows";
+	if (platform === "linux") return "linux";
+	if (platform === "darwin") return "desktop";
+	return "server";
+}
+//#endregion
 //#region src/environment/Layers/ServerEnvironment.ts
 function platformOs() {
 	switch (process.platform) {
@@ -92415,18 +92549,22 @@ const makeServerEnvironment = effect.Effect.fn("makeServerEnvironment")(function
 	});
 	const environmentId = require_collectUint8StreamText.EnvironmentId.make(environmentIdRaw);
 	const cwdBaseName = path.basename(serverConfig.cwd).trim();
+	const label = yield* resolveServerEnvironmentLabel({ cwdBaseName });
 	const descriptor = {
 		environmentId,
-		label: yield* resolveServerEnvironmentLabel({ cwdBaseName }),
+		label,
 		platform: {
 			os: platformOs(),
-			arch: platformArch()
+			arch: platformArch(),
+			machine: inferEnvironmentMachineKind(platformOs(), label)
 		},
 		serverVersion: version$1,
 		capabilities: {
 			repositoryIdentity: true,
 			threadSettlement: true,
 			threadSnooze: true,
+			projectIcons: true,
+			environmentIcon: true,
 			threadPriorityRanking: true,
 			fileAttachments: { maxUploadBytes: require_collectUint8StreamText.PROVIDER_SEND_TURN_MAX_FILE_BYTES }
 		}
@@ -94168,6 +94306,121 @@ const makeProjectAtlassianLinkRepository = effect.Effect.gen(function* () {
 });
 const ProjectAtlassianLinkRepositoryLive = effect.Layer.effect(ProjectAtlassianLinkRepository, makeProjectAtlassianLinkRepository);
 //#endregion
+//#region src/persistence/Layers/ProjectionProjects.ts
+const ProjectionProjectDbRow = ProjectionProject.mapFields(effect.Struct.assign({
+	defaultModelSelection: effect.Schema.NullOr(effect.Schema.fromJsonString(require_collectUint8StreamText.ModelSelection)),
+	scripts: effect.Schema.fromJsonString(effect.Schema.Array(require_collectUint8StreamText.ProjectScript))
+}));
+const makeProjectionProjectRepository = effect.Effect.gen(function* () {
+	const sql = yield* effect_unstable_sql_SqlClient.SqlClient;
+	const upsertProjectionProjectRow = effect_unstable_sql_SqlSchema.void({
+		Request: ProjectionProject,
+		execute: (row) => sql`
+        INSERT INTO projection_projects (
+          project_id,
+          title,
+          workspace_root,
+          project_metadata_dir,
+          default_model_selection_json,
+          custom_system_prompt,
+          custom_avatar_content_hash,
+          preferred_remote_name,
+          scripts_json,
+          created_at,
+          updated_at,
+          deleted_at
+        )
+        VALUES (
+          ${row.projectId},
+          ${row.title},
+          ${row.workspaceRoot},
+          ${row.projectMetadataDir},
+          ${row.defaultModelSelection !== null ? JSON.stringify(row.defaultModelSelection) : null},
+          ${row.customSystemPrompt ?? null},
+          ${row.customAvatarContentHash ?? null},
+          ${row.preferredRemoteName ?? null},
+          ${JSON.stringify(row.scripts)},
+          ${row.createdAt},
+          ${row.updatedAt},
+          ${row.deletedAt}
+        )
+        ON CONFLICT (project_id)
+        DO UPDATE SET
+          title = excluded.title,
+          workspace_root = excluded.workspace_root,
+          project_metadata_dir = excluded.project_metadata_dir,
+          default_model_selection_json = excluded.default_model_selection_json,
+          custom_system_prompt = excluded.custom_system_prompt,
+          custom_avatar_content_hash = excluded.custom_avatar_content_hash,
+          preferred_remote_name = excluded.preferred_remote_name,
+          scripts_json = excluded.scripts_json,
+          created_at = excluded.created_at,
+          updated_at = excluded.updated_at,
+          deleted_at = excluded.deleted_at
+      `
+	});
+	const getProjectionProjectRow = effect_unstable_sql_SqlSchema.findOneOption({
+		Request: GetProjectionProjectInput,
+		Result: ProjectionProjectDbRow,
+		execute: ({ projectId }) => sql`
+        SELECT
+          project_id AS "projectId",
+          title,
+          workspace_root AS "workspaceRoot",
+          project_metadata_dir AS "projectMetadataDir",
+          default_model_selection_json AS "defaultModelSelection",
+          custom_system_prompt AS "customSystemPrompt",
+          custom_avatar_content_hash AS "customAvatarContentHash",
+          preferred_remote_name AS "preferredRemoteName",
+          scripts_json AS "scripts",
+          created_at AS "createdAt",
+          updated_at AS "updatedAt",
+          deleted_at AS "deletedAt"
+        FROM projection_projects
+        WHERE project_id = ${projectId}
+      `
+	});
+	const listProjectionProjectRows = effect_unstable_sql_SqlSchema.findAll({
+		Request: effect.Schema.Void,
+		Result: ProjectionProjectDbRow,
+		execute: () => sql`
+        SELECT
+          project_id AS "projectId",
+          title,
+          workspace_root AS "workspaceRoot",
+          project_metadata_dir AS "projectMetadataDir",
+          default_model_selection_json AS "defaultModelSelection",
+          custom_system_prompt AS "customSystemPrompt",
+          custom_avatar_content_hash AS "customAvatarContentHash",
+          preferred_remote_name AS "preferredRemoteName",
+          scripts_json AS "scripts",
+          created_at AS "createdAt",
+          updated_at AS "updatedAt",
+          deleted_at AS "deletedAt"
+        FROM projection_projects
+        ORDER BY created_at ASC, project_id ASC
+      `
+	});
+	const deleteProjectionProjectRow = effect_unstable_sql_SqlSchema.void({
+		Request: DeleteProjectionProjectInput,
+		execute: ({ projectId }) => sql`
+        DELETE FROM projection_projects
+        WHERE project_id = ${projectId}
+      `
+	});
+	const upsert = (row) => upsertProjectionProjectRow(row).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.upsert:query")));
+	const getById = (input) => getProjectionProjectRow(input).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.getById:query")));
+	const listAll = () => listProjectionProjectRows().pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.listAll:query")));
+	const deleteById = (input) => deleteProjectionProjectRow(input).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.deleteById:query")));
+	return {
+		upsert,
+		getById,
+		listAll,
+		deleteById
+	};
+});
+const ProjectionProjectRepositoryLive = effect.Layer.effect(ProjectionProjectRepository, makeProjectionProjectRepository);
+//#endregion
 //#region src/persistence/Layers/ProjectionWorktrees.ts
 const ProjectionWorktreeDbRowSchema$1 = ProjectionWorktree.mapFields(effect.Struct.assign({ prIsDraft: effect.Schema.NullOr(effect.Schema.Number) }));
 function toProjectionWorktree(row) {
@@ -107091,36 +107344,6 @@ const DeleteProjectionPendingApprovalInput = effect.Schema.Struct({ requestId: r
 */
 var ProjectionPendingApprovalRepository = class extends effect.Context.Service()("ryco/persistence/Services/ProjectionPendingApprovals/ProjectionPendingApprovalRepository") {};
 //#endregion
-//#region src/persistence/Services/ProjectionProjects.ts
-/**
-* ProjectionProjectRepository - Projection repository interface for projects.
-*
-* Owns persistence operations for project rows in the orchestration projection
-* read model.
-*
-* @module ProjectionProjectRepository
-*/
-const ProjectionProject = effect.Schema.Struct({
-	projectId: require_collectUint8StreamText.ProjectId,
-	title: effect.Schema.String,
-	workspaceRoot: effect.Schema.String,
-	projectMetadataDir: require_collectUint8StreamText.ProjectMetadataDir,
-	defaultModelSelection: effect.Schema.NullOr(require_collectUint8StreamText.ModelSelection),
-	customSystemPrompt: effect.Schema.optional(effect.Schema.NullOr(effect.Schema.String)),
-	customAvatarContentHash: effect.Schema.NullOr(effect.Schema.String),
-	preferredRemoteName: effect.Schema.NullOr(effect.Schema.String),
-	scripts: effect.Schema.Array(require_collectUint8StreamText.ProjectScript),
-	createdAt: require_collectUint8StreamText.IsoDateTime,
-	updatedAt: require_collectUint8StreamText.IsoDateTime,
-	deletedAt: effect.Schema.NullOr(require_collectUint8StreamText.IsoDateTime)
-});
-const GetProjectionProjectInput = effect.Schema.Struct({ projectId: require_collectUint8StreamText.ProjectId });
-const DeleteProjectionProjectInput = effect.Schema.Struct({ projectId: require_collectUint8StreamText.ProjectId });
-/**
-* ProjectionProjectRepository - Service tag for project projection persistence.
-*/
-var ProjectionProjectRepository = class extends effect.Context.Service()("ryco/persistence/Services/ProjectionProjects/ProjectionProjectRepository") {};
-//#endregion
 //#region src/persistence/Services/ProjectionState.ts
 /**
 * ProjectionStateRepository - Projection repository interface for projector cursors.
@@ -107407,121 +107630,6 @@ const makeProjectionPendingApprovalRepository = effect.Effect.gen(function* () {
 });
 const ProjectionPendingApprovalRepositoryLive = effect.Layer.effect(ProjectionPendingApprovalRepository, makeProjectionPendingApprovalRepository);
 //#endregion
-//#region src/persistence/Layers/ProjectionProjects.ts
-const ProjectionProjectDbRow = ProjectionProject.mapFields(effect.Struct.assign({
-	defaultModelSelection: effect.Schema.NullOr(effect.Schema.fromJsonString(require_collectUint8StreamText.ModelSelection)),
-	scripts: effect.Schema.fromJsonString(effect.Schema.Array(require_collectUint8StreamText.ProjectScript))
-}));
-const makeProjectionProjectRepository = effect.Effect.gen(function* () {
-	const sql = yield* effect_unstable_sql_SqlClient.SqlClient;
-	const upsertProjectionProjectRow = effect_unstable_sql_SqlSchema.void({
-		Request: ProjectionProject,
-		execute: (row) => sql`
-        INSERT INTO projection_projects (
-          project_id,
-          title,
-          workspace_root,
-          project_metadata_dir,
-          default_model_selection_json,
-          custom_system_prompt,
-          custom_avatar_content_hash,
-          preferred_remote_name,
-          scripts_json,
-          created_at,
-          updated_at,
-          deleted_at
-        )
-        VALUES (
-          ${row.projectId},
-          ${row.title},
-          ${row.workspaceRoot},
-          ${row.projectMetadataDir},
-          ${row.defaultModelSelection !== null ? JSON.stringify(row.defaultModelSelection) : null},
-          ${row.customSystemPrompt ?? null},
-          ${row.customAvatarContentHash ?? null},
-          ${row.preferredRemoteName ?? null},
-          ${JSON.stringify(row.scripts)},
-          ${row.createdAt},
-          ${row.updatedAt},
-          ${row.deletedAt}
-        )
-        ON CONFLICT (project_id)
-        DO UPDATE SET
-          title = excluded.title,
-          workspace_root = excluded.workspace_root,
-          project_metadata_dir = excluded.project_metadata_dir,
-          default_model_selection_json = excluded.default_model_selection_json,
-          custom_system_prompt = excluded.custom_system_prompt,
-          custom_avatar_content_hash = excluded.custom_avatar_content_hash,
-          preferred_remote_name = excluded.preferred_remote_name,
-          scripts_json = excluded.scripts_json,
-          created_at = excluded.created_at,
-          updated_at = excluded.updated_at,
-          deleted_at = excluded.deleted_at
-      `
-	});
-	const getProjectionProjectRow = effect_unstable_sql_SqlSchema.findOneOption({
-		Request: GetProjectionProjectInput,
-		Result: ProjectionProjectDbRow,
-		execute: ({ projectId }) => sql`
-        SELECT
-          project_id AS "projectId",
-          title,
-          workspace_root AS "workspaceRoot",
-          project_metadata_dir AS "projectMetadataDir",
-          default_model_selection_json AS "defaultModelSelection",
-          custom_system_prompt AS "customSystemPrompt",
-          custom_avatar_content_hash AS "customAvatarContentHash",
-          preferred_remote_name AS "preferredRemoteName",
-          scripts_json AS "scripts",
-          created_at AS "createdAt",
-          updated_at AS "updatedAt",
-          deleted_at AS "deletedAt"
-        FROM projection_projects
-        WHERE project_id = ${projectId}
-      `
-	});
-	const listProjectionProjectRows = effect_unstable_sql_SqlSchema.findAll({
-		Request: effect.Schema.Void,
-		Result: ProjectionProjectDbRow,
-		execute: () => sql`
-        SELECT
-          project_id AS "projectId",
-          title,
-          workspace_root AS "workspaceRoot",
-          project_metadata_dir AS "projectMetadataDir",
-          default_model_selection_json AS "defaultModelSelection",
-          custom_system_prompt AS "customSystemPrompt",
-          custom_avatar_content_hash AS "customAvatarContentHash",
-          preferred_remote_name AS "preferredRemoteName",
-          scripts_json AS "scripts",
-          created_at AS "createdAt",
-          updated_at AS "updatedAt",
-          deleted_at AS "deletedAt"
-        FROM projection_projects
-        ORDER BY created_at ASC, project_id ASC
-      `
-	});
-	const deleteProjectionProjectRow = effect_unstable_sql_SqlSchema.void({
-		Request: DeleteProjectionProjectInput,
-		execute: ({ projectId }) => sql`
-        DELETE FROM projection_projects
-        WHERE project_id = ${projectId}
-      `
-	});
-	const upsert = (row) => upsertProjectionProjectRow(row).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.upsert:query")));
-	const getById = (input) => getProjectionProjectRow(input).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.getById:query")));
-	const listAll = () => listProjectionProjectRows().pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.listAll:query")));
-	const deleteById = (input) => deleteProjectionProjectRow(input).pipe(effect.Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.deleteById:query")));
-	return {
-		upsert,
-		getById,
-		listAll,
-		deleteById
-	};
-});
-const ProjectionProjectRepositoryLive = effect.Layer.effect(ProjectionProjectRepository, makeProjectionProjectRepository);
-//#endregion
 //#region src/persistence/Layers/ProjectionState.ts
 const MinLastAppliedSequenceRowSchema = effect.Schema.Struct({ minLastAppliedSequence: effect.Schema.NullOr(require_collectUint8StreamText.NonNegativeInt) });
 const makeProjectionStateRepository = effect.Effect.gen(function* () {
@@ -109994,7 +110102,14 @@ const makeProjectionSnapshotQuery = effect.Effect.gen(function* () {
 	const resolveRepositoryIdentitiesForProjects = effect.Effect.fn("ProjectionSnapshotQuery.resolveRepositoryIdentitiesForProjects")(function* (projectRows, options) {
 		const filteredProjectRows = options?.includeDeleted === true ? projectRows : projectRows.filter((row) => row.deletedAt === null);
 		const uniqueWorkspaceRoots = [...new Set(filteredProjectRows.map((row) => row.workspaceRoot))];
-		const repositoryIdentityByWorkspaceRoot = new Map(yield* effect.Effect.forEach(uniqueWorkspaceRoots, (workspaceRoot) => repositoryIdentityResolver.resolve(workspaceRoot).pipe(effect.Effect.map((identity) => [workspaceRoot, identity])), { concurrency: repositoryIdentityResolutionConcurrency }));
+		const repositoryIdentityByWorkspaceRoot = /* @__PURE__ */ new Map();
+		const resolveIdentities = effect.Effect.forEach(uniqueWorkspaceRoots, (workspaceRoot) => repositoryIdentityResolver.resolve(workspaceRoot).pipe(effect.Effect.tap((identity) => effect.Effect.sync(() => {
+			repositoryIdentityByWorkspaceRoot.set(workspaceRoot, identity);
+		}))), {
+			concurrency: repositoryIdentityResolutionConcurrency,
+			discard: true
+		});
+		yield* options?.timeoutMs === void 0 ? resolveIdentities : resolveIdentities.pipe(effect.Effect.timeoutOption(options.timeoutMs));
 		return new Map(filteredProjectRows.map((row) => [row.projectId, repositoryIdentityByWorkspaceRoot.get(row.workspaceRoot) ?? null]));
 	});
 	const listProjectRows = effect_unstable_sql_SqlSchema.findAll({
@@ -111384,7 +111499,7 @@ const makeProjectionSnapshotQuery = effect.Effect.gen(function* () {
 			if (row.completedAt !== null) updatedAt = maxIso(updatedAt, row.completedAt);
 		}
 		for (const row of stateRows) updatedAt = maxIso(updatedAt, row.updatedAt);
-		const repositoryIdentities = yield* resolveRepositoryIdentitiesForProjects(projectRows);
+		const repositoryIdentities = yield* resolveRepositoryIdentitiesForProjects(projectRows, { timeoutMs: 1e3 });
 		const latestTurnByThread = new Map(latestTurnRows.map((row) => [row.threadId, mapLatestTurn(row)]));
 		const sessionByThread = new Map(sessionRows.map((row) => [row.threadId, mapSessionRow(row)]));
 		const activeProjectIds = new Set(projectRows.filter((row) => row.deletedAt === null).map((row) => row.projectId));
@@ -112072,7 +112187,7 @@ const WorkspaceLayerLive = effect.Layer.mergeAll(WorkspaceAccessPolicyLive, Work
 const AuthLayerLive = ServerAuthLive.pipe(effect.Layer.provideMerge(PersistenceLayerLive), effect.Layer.provide(ServerSecretStoreLive));
 const AtlassianLayerLive = effect.Layer.mergeAll(layer$18, layer$2).pipe(effect.Layer.provideMerge(AtlassianConnectionRepositoryLive), effect.Layer.provideMerge(AtlassianResourceRepositoryLive), effect.Layer.provideMerge(ProjectAtlassianLinkRepositoryLive), effect.Layer.provideMerge(PersistenceLayerLive), effect.Layer.provide(ServerSecretStoreLive));
 const ProviderRuntimeLayerLive = ProviderSessionReaperLive.pipe(effect.Layer.provideMerge(ProviderLayerLive), effect.Layer.provideMerge(OrchestrationLayerLive));
-const RuntimeCoreBaseDependenciesLive = RuntimeFeatureLayerLive.pipe(effect.Layer.provideMerge(CheckpointingLayerLive), effect.Layer.provideMerge(SourceControlProviderRegistryLayerLive), effect.Layer.provideMerge(GitLayerLive), effect.Layer.provideMerge(VcsLayerLive), effect.Layer.provideMerge(ProviderRuntimeLayerLive), effect.Layer.provideMerge(TerminalLayerLive), effect.Layer.provideMerge(AgentControlLayerLive), effect.Layer.provideMerge(PersistenceLayerLive), effect.Layer.provideMerge(ProjectionWorktreeRepositoryLive), effect.Layer.provideMerge(KeybindingsLive), effect.Layer.provideMerge(ProviderRegistryLive), effect.Layer.provideMerge(ProviderInstanceRegistryHydrationLive), effect.Layer.provideMerge(AgentControlSessionRegistryLayerLive), effect.Layer.provideMerge(ProviderEventLoggersLive), effect.Layer.provideMerge(layer$1), effect.Layer.provideMerge(OpenCodeRuntimeLive), effect.Layer.provideMerge(WorkspaceLayerLive), effect.Layer.provideMerge(ProjectFaviconResolverLive), effect.Layer.provideMerge(ProjectAvatarStoreLayerLive));
+const RuntimeCoreBaseDependenciesLive = RuntimeFeatureLayerLive.pipe(effect.Layer.provideMerge(CheckpointingLayerLive), effect.Layer.provideMerge(SourceControlProviderRegistryLayerLive), effect.Layer.provideMerge(GitLayerLive), effect.Layer.provideMerge(VcsLayerLive), effect.Layer.provideMerge(ProviderRuntimeLayerLive), effect.Layer.provideMerge(TerminalLayerLive), effect.Layer.provideMerge(AgentControlLayerLive), effect.Layer.provideMerge(PersistenceLayerLive), effect.Layer.provideMerge(ProjectionWorktreeRepositoryLive), effect.Layer.provideMerge(ProjectionProjectRepositoryLive), effect.Layer.provideMerge(KeybindingsLive), effect.Layer.provideMerge(ProviderRegistryLive), effect.Layer.provideMerge(ProviderInstanceRegistryHydrationLive), effect.Layer.provideMerge(AgentControlSessionRegistryLayerLive), effect.Layer.provideMerge(ProviderEventLoggersLive), effect.Layer.provideMerge(layer$1), effect.Layer.provideMerge(OpenCodeRuntimeLive), effect.Layer.provideMerge(WorkspaceLayerLive), effect.Layer.provideMerge(ProjectFaviconResolverLive), effect.Layer.provideMerge(ProjectAvatarStoreLayerLive));
 const RuntimeDependenciesLive = effect.Layer.mergeAll(RuntimeCoreBaseDependenciesLive, UsageServiceLive).pipe(effect.Layer.provideMerge(ServerSettingsLive)).pipe(effect.Layer.provideMerge(RepositoryIdentityResolverLive), effect.Layer.provideMerge(ServerEnvironmentLive), effect.Layer.provideMerge(AdvertisedEndpointRegistryLive), effect.Layer.provideMerge(AuthLayerLive), effect.Layer.provideMerge(AtlassianLayerLive)).pipe(effect.Layer.provideMerge(AnalyticsServiceLayerLive), effect.Layer.provideMerge(OpenLive), effect.Layer.provideMerge(ServerLifecycleEventsLive), effect.Layer.provideMerge(ChatAttachmentUploadsLive), effect.Layer.provide(NetService.layer));
 const RuntimeServicesLive = effect.Layer.mergeAll(ServerRuntimeStartupLive, AgentControlMcpServerLive.pipe(effect.Layer.provideMerge(AgentControlDiagnosticsServiceLive), effect.Layer.provideMerge(AgentControlActionValidatorLive), effect.Layer.provideMerge(AgentControlProjectPlansLive)), AgentControlExternalMcpServerLive.pipe(effect.Layer.provideMerge(AgentControlDiagnosticsServiceLive), effect.Layer.provideMerge(AgentControlActionValidatorLive), effect.Layer.provideMerge(AgentControlProjectPlansLive), effect.Layer.provideMerge(AgentControlExternalTaskServiceLive.pipe(effect.Layer.provideMerge(AgentControlActionValidatorLive), effect.Layer.provideMerge(AgentControlProjectPlansLive)))), AgentControlExecutionLive.pipe(effect.Layer.provideMerge(ServerRuntimeStartupLive), effect.Layer.provideMerge(AgentControlActionValidatorLive), effect.Layer.provideMerge(AgentControlProjectPlansLive), effect.Layer.provideMerge(OrchestrationCommandApplicationLive))).pipe(effect.Layer.provideMerge(RuntimeDependenciesLive), effect.Layer.provideMerge(DeviceServiceLive));
 const authRoutesLayer = effect.Layer.mergeAll(authBearerBootstrapRouteLayer, authBootstrapRouteLayer, authClientsRevokeOthersRouteLayer, authClientsRevokeRouteLayer, authClientsRouteLayer, authPairingLinksRevokeRouteLayer, authPairingLinksRouteLayer, authPairingCredentialRouteLayer, authSessionRouteLayer, authWebSocketTokenRouteLayer);
@@ -112080,7 +112195,7 @@ const projectAssetRoutesLayer = effect.Layer.mergeAll(projectFaviconRouteLayer,
 const makeRoutesLayer = effect.Layer.mergeAll(authRoutesLayer, attachmentsRouteLayer, attachmentUploadRouteLayer, orchestrationDispatchRouteLayer, orchestrationSnapshotRouteLayer, otlpTracesProxyRouteLayer, projectAssetRoutesLayer, serverEnvironmentRouteLayer, legacyServerEnvironmentRouteLayer, staticAndDevRouteLayer, websocketRpcRouteLayer, deviceWebsocketRpcRouteLayer, deviceFrameRouteLayer, hubConnectorRoutesLayer, desktopLocalIntroductionRoutesLayer, desktopNativeNodeClaimRoutesLayer).pipe(effect.Layer.provide(browserApiCorsLayer));
 const makeServerLayer = effect.Layer.unwrap(effect.Effect.gen(function* () {
 	const config = yield* require_Metrics.ServerConfig;
-	fixPath();
+	fixPath({ inheritedFromDesktop: config.mode === "desktop" });
 	const httpListeningLayer = effect.Layer.effectDiscard(effect.Effect.gen(function* () {
 		yield* effect_unstable_http.HttpServer.HttpServer;
 		yield* (yield* ServerRuntimeStartup).markHttpListening;