ryco-cli 0.1.30 → 0.1.31

package/dist/{Metrics-C0LSU8s7.cjs → Metrics-DjRPLE98.cjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const require_rolldown_runtime = require("./rolldown-runtime-HbSU0i7K.cjs");
-const require_src = require("./src-CARHuYkT.cjs");
+const require_src = require("./src-FmeCeBJ9.cjs");
 const require_schemaJson = require("./schemaJson-CuhFxa8p.cjs");
 const require_processRunner = require("./processRunner-BP9l9eOt.cjs");
 let effect = require("effect");
@@ -2673,6 +2673,21 @@ function createModelSelection(instanceId, model, options) {
 		options: selections
 	} : base;
 }
+function canonicalOptionKeys(options) {
+	return (options ?? []).map((option) => JSON.stringify([option.id, option.value])).toSorted((left, right) => left < right ? -1 : left > right ? 1 : 0);
+}
+/**
+* Semantic equality of two model selections: same instance and model, and the
+* same options regardless of their order (absent options equal an empty list).
+* Key order never matters, so a selection round-tripped through JSON and schema
+* decode equals the hydrated one.
+*/
+function sameModelSelection(left, right) {
+	if (left.instanceId !== right.instanceId || left.model !== right.model) return false;
+	const leftOptions = canonicalOptionKeys(left.options);
+	const rightOptions = canonicalOptionKeys(right.options);
+	return leftOptions.length === rightOptions.length && leftOptions.every((key, index) => rightOptions[index] === key);
+}
 /**
 * Context handoff is a provider-instance boundary. Model and option changes
 * within one configured instance remain on that provider's normal turn path.
@@ -2804,6 +2819,15 @@ function applyServerSettingsPatch(current, patch) {
 			projectStorageRetention: Object.fromEntries(policies)
 		};
 	}
+	if (patch.projectLifecycleSuggestions !== void 0) {
+		const policies = new Map(Object.entries(current.projectLifecycleSuggestions));
+		for (const [projectId, policy] of Object.entries(patch.projectLifecycleSuggestions)) if (policy === null) policies.delete(projectId);
+		else policies.set(projectId, policy);
+		next = {
+			...next,
+			projectLifecycleSuggestions: Object.fromEntries(policies)
+		};
+	}
 	const nextWithReplacements = patch.providerInstances !== void 0 ? {
 		...next,
 		providerInstances: patch.providerInstances
@@ -2933,6 +2957,10 @@ function resolveNodeE2eePolicyConfig(raw) {
 function resolveManagedWorktreesRoot(config) {
 	return config.workspaceAccessRoot === void 0 ? config.worktreesDir : node_path.default.join(config.workspaceAccessRoot, ".ryco", "worktrees");
 }
+/** The chats root used when the `chatsRoot` setting is empty. */
+function resolveManagedChatsRoot(config) {
+	return config.workspaceAccessRoot === void 0 ? config.chatsDir : node_path.default.join(config.workspaceAccessRoot, ".ryco", "chats");
+}
 const deriveServerPaths = effect.Effect.fn(function* (baseDir, devUrl) {
 	const { join } = yield* effect.Path.Path;
 	const stateDir = join(baseDir, devUrl !== void 0 ? "dev" : "userdata");
@@ -2948,6 +2976,7 @@ const deriveServerPaths = effect.Effect.fn(function* (baseDir, devUrl) {
 		settingsPath: join(stateDir, "settings.json"),
 		providerStatusCacheDir,
 		worktreesDir: join(baseDir, "worktrees"),
+		chatsDir: join(baseDir, "chats"),
 		attachmentsDir,
 		logsDir,
 		serverLogPath: join(logsDir, "server.log"),
@@ -3455,6 +3484,11 @@ async function removeVerifiedWorktree(repository, candidate, cleanup) {
 //#region src/storage/lifecycle.ts
 const storageLifecycleLock = effect.Semaphore.makeUnsafe(1);
 const creations = /* @__PURE__ */ new Map();
+let activityVersion = 0;
+const noteStorageActivity = () => {
+	activityVersion++;
+};
+const storageActivityVersion = () => activityVersion;
 const overlaps = (a, b, platform = process.platform) => {
 	if (platform === "darwin" || platform === "win32") {
 		a = a.toLowerCase();
@@ -3463,6 +3497,12 @@ const overlaps = (a, b, platform = process.platform) => {
 	const boundary = (root) => root.endsWith(node_path.default.sep) ? root : root + node_path.default.sep;
 	return a === b || a.startsWith(boundary(b)) || b.startsWith(boundary(a));
 };
+/** `candidate` is `root` or below it. */
+const contains = (root, candidate, platform) => {
+	const a = platform === "darwin" || platform === "win32" ? root.toLowerCase() : root;
+	const b = platform === "darwin" || platform === "win32" ? candidate.toLowerCase() : candidate;
+	return a === b || b.startsWith(a.endsWith(node_path.default.sep) ? a : a + node_path.default.sep);
+};
 const removingPaths = (row) => {
 	let identity;
 	try {
@@ -3493,6 +3533,7 @@ async function canonicalStoragePath(candidate) {
 function acquireWorktreeCreationLease(sql, candidate) {
 	return storageLifecycleLock.withPermit(effect.Effect.gen(function* () {
 		const canonical = yield* effect.Effect.tryPromise(() => canonicalStoragePath(candidate));
+		if (yield* isWorktreeRelocationBlocked(sql, canonical)) return yield* new require_src.StorageError({ detail: "Checkout relocation is pending or this is a retired checkout path. Reload the workspace." });
 		const pending = yield* sql`SELECT path, identity_json FROM storage_owned_entries WHERE state = 'removing' LIMIT 257`;
 		if (pending.length > 256) return yield* new require_src.StorageError({ detail: "Too many interrupted cleanups to establish safe creation admission. Inspect pending cleanup records." });
 		if (pending.some((row) => removingPaths(row).some((root) => overlaps(root, canonical)))) return yield* new require_src.StorageError({ detail: "Checkout cleanup is pending. Creation cannot replace an in-flight removal." });
@@ -3501,6 +3542,7 @@ function acquireWorktreeCreationLease(sql, candidate) {
 			const remaining = (creations.get(canonical) ?? 1) - 1;
 			if (remaining > 0) creations.set(canonical, remaining);
 			else creations.delete(canonical);
+			noteStorageActivity();
 		});
 	}));
 }
@@ -3508,12 +3550,14 @@ function acquireWorktreeCreationLease(sql, candidate) {
 function acquireStoragePathUseLease(sql, candidate) {
 	return storageLifecycleLock.withPermit(effect.Effect.gen(function* () {
 		const canonical = yield* effect.Effect.tryPromise(() => canonicalStoragePath(candidate));
-		if (yield* isStoragePathBlocked(sql, canonical)) return yield* new require_src.StorageError({ detail: "Checkout cleanup is pending or complete. Restore/recreate it before provider recovery." });
+		const blocker = yield* storagePathBlocker(sql, canonical);
+		if (blocker !== null) return yield* new require_src.StorageError({ detail: blocker === "project-relocation" ? require_src.PROJECT_RELOCATION_PENDING_MESSAGE : "Checkout cleanup is pending or complete. Restore/recreate it before provider recovery." });
 		creations.set(canonical, (creations.get(canonical) ?? 0) + 1);
 		return effect.Effect.sync(() => {
 			const remaining = (creations.get(canonical) ?? 1) - 1;
 			if (remaining > 0) creations.set(canonical, remaining);
 			else creations.delete(canonical);
+			noteStorageActivity();
 		});
 	}));
 }
@@ -3541,8 +3585,22 @@ function recordCreatedWorktree(sql, repository, candidate) {
       WHERE storage_owned_entries.state != 'removing' RETURNING id`).length !== 1) return yield* new require_src.StorageError({ detail: "Ownership capture refused to replace a pending cleanup. The creation outcome remains protected." });
 	});
 }
-/** Persistent tombstones prevent restart/resume from granting authority to a removed checkout. */
-function isStoragePathBlocked(sql, candidate, platform = process.platform) {
+/**
+* Storage admission for a path: refused while a chat's folder moves or checkout lifecycle work
+* fences it. Persistent tombstones prevent restart/resume from granting authority to a removed
+* checkout.
+*/
+function isStoragePathBlocked(sql, candidate, platform = process.platform, ignoredRelocationId) {
+	return storagePathBlocker(sql, candidate, platform, ignoredRelocationId).pipe(effect.Effect.map((blocker) => blocker !== null));
+}
+/** {@link isStoragePathBlocked}, with the reason, so admission can tell a retryable move apart. */
+function storagePathBlocker(sql, candidate, platform = process.platform, ignoredRelocationId) {
+	return effect.Effect.gen(function* () {
+		if (yield* isProjectRelocationBlocked(sql, candidate, platform)) return "project-relocation";
+		return (yield* isCheckoutPathBlocked(sql, candidate, platform, ignoredRelocationId)) ? "checkout" : null;
+	});
+}
+function isCheckoutPathBlocked(sql, candidate, platform, ignoredRelocationId) {
 	const ancestors = [];
 	let current = node_path.default.resolve(candidate);
 	for (;;) {
@@ -3553,11 +3611,42 @@ function isStoragePathBlocked(sql, candidate, platform = process.platform) {
 	}
 	const matching = platform === "darwin" || platform === "win32" ? sql`path COLLATE NOCASE IN ${sql.in(ancestors)}` : sql.in("path", ancestors);
 	return effect.Effect.gen(function* () {
+		if (yield* isWorktreeRelocationBlocked(sql, candidate, platform, ignoredRelocationId)) return true;
 		if ((yield* sql`SELECT path FROM storage_owned_entries WHERE state IN ('removing', 'removed') AND ${matching} LIMIT 1`).length) return true;
 		const pending = yield* sql`SELECT path, identity_json FROM storage_owned_entries WHERE state = 'removing' LIMIT 257`;
 		return pending.length > 256 || pending.some((row) => removingPaths(row).some((root) => overlaps(root, node_path.default.resolve(candidate), platform)));
 	});
 }
+/** Active moves fence both paths; completed moves permanently fence the old path. */
+function isWorktreeRelocationBlocked(sql, candidate, platform = process.platform, ignoredRelocationId) {
+	return effect.Effect.gen(function* () {
+		if (!(yield* sql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'managed_worktree_relocations'`).length) return false;
+		const rows = yield* sql`
+      SELECT source_path, destination_path, state FROM managed_worktree_relocations
+      WHERE state IN ('moving', 'moved', 'attention', 'complete')
+        AND worktree_id != ${ignoredRelocationId ?? ""}`;
+		const resolved = node_path.default.resolve(candidate);
+		return rows.some((row) => row.state === "complete" ? contains(row.source_path, resolved, platform) : overlaps(row.source_path, resolved, platform) || overlaps(row.destination_path, resolved, platform));
+	});
+}
+/**
+* An unsettled chat promotion (`project_relocations` row `pending` or `moved`, see
+* `project/chatPromotion.ts`) fences everything at or below both of its paths, so no turn, provider
+* session or terminal starts in a folder that is moving. Promotion writes the row before it stops
+* sessions and closes terminals. Unlike a checkout move, ancestors stay usable: a project that
+* merely contains the chats folder is unrelated, and a write into a moving copy fails its
+* verification. Settled moves lift the fence; the project then points at its new root.
+*/
+function isProjectRelocationBlocked(sql, candidate, platform = process.platform) {
+	return effect.Effect.gen(function* () {
+		if (!(yield* sql`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'project_relocations'`).length) return false;
+		const rows = yield* sql`
+      SELECT source_path, destination_path FROM project_relocations
+      WHERE state IN ('pending', 'moved')`;
+		const resolved = node_path.default.resolve(candidate);
+		return rows.some((row) => contains(row.source_path, resolved, platform) || contains(row.destination_path, resolved, platform));
+	});
+}
 //#endregion
 //#region src/atomicWrite.ts
 const writeFileStringAtomically = (input) => effect.Effect.scoped(effect.Effect.gen(function* () {
@@ -3668,7 +3757,11 @@ function expandHomePath(value) {
 }
 //#endregion
 //#region src/project/worktreeRoot.ts
-var WorktreeRootError = class extends effect.Schema.TaggedError()("WorktreeRootError", { detail: effect.Schema.String }) {
+var WorktreeRootError = class extends effect.Schema.TaggedError()("WorktreeRootError", {
+	detail: effect.Schema.String,
+	/** `restricted`: the workspace access policy rejected it; `unusable`: the path itself is. */
+	reason: effect.Schema.optional(effect.Schema.Literals(["unusable", "restricted"]))
+}) {
 	get message() {
 		return this.detail;
 	}
@@ -3698,6 +3791,8 @@ async function resolveWorktreePath(candidate) {
 		ancestor = parent;
 	}
 }
+/** The canonical nearest existing ancestor; probes that need a real cwd run there. */
+const resolveExistingAncestor = async (candidate) => (await resolveWorktreePath(candidate)).existingAncestor;
 /** One identity for existing and missing worktree paths; no writable-access requirement.
 * Shared by destination locks, journal lookup and Git-registration comparisons.
 */
@@ -3708,23 +3803,37 @@ async function canonicalizeWorktreeDirectory(candidate) {
 	await (0, node_fs_promises.access)(resolved.existingAncestor, node_fs.constants.W_OK | node_fs.constants.X_OK);
 	return resolved.canonicalPath;
 }
-const validateWorktreeRoot = (value, policy) => effect.Effect.gen(function* () {
+/**
+* Validate a node-local root setting (worktree root, chats folder). `label` names the setting in
+* user-facing errors.
+*/
+const validateWorktreeRoot = (value, policy, label = "Worktree root") => effect.Effect.gen(function* () {
 	const trimmed = value.trim();
 	const expanded = expandHomePath(trimmed);
-	if (!trimmed || /[\x00-\x1f\x7f]/.test(trimmed) || !node_path.default.isAbsolute(expanded) || process.platform === "win32" && !/^(?:[A-Za-z]:[\\/]|\\\\[^\\]+\\[^\\]+)/.test(expanded)) return yield* new WorktreeRootError({ detail: "Worktree root must be an absolute directory on this node or start with ~/." });
-	const operation = "worktree root";
+	if (!trimmed || /[\x00-\x1f\x7f]/.test(trimmed) || !node_path.default.isAbsolute(expanded) || process.platform === "win32" && !/^(?:[A-Za-z]:[\\/]|\\\\[^\\]+\\[^\\]+)/.test(expanded)) return yield* new WorktreeRootError({
+		detail: `${label} must be an absolute directory on this node or start with ~/.`,
+		reason: "unusable"
+	});
+	const operation = label.toLowerCase();
+	const restricted = (cause) => new WorktreeRootError({
+		detail: cause.message,
+		reason: "restricted"
+	});
 	const authorized = yield* policy.assertPath({
 		path: node_path.default.normalize(expanded),
 		operation
-	}).pipe(effect.Effect.mapError((cause) => new WorktreeRootError({ detail: cause.message })));
+	}).pipe(effect.Effect.mapError(restricted));
 	const canonical = yield* effect.Effect.tryPromise({
 		try: () => canonicalizeWorktreeDirectory(authorized),
-		catch: () => new WorktreeRootError({ detail: "Worktree root must resolve to a writable directory (or have a writable existing parent), without broken symlinks." })
+		catch: () => new WorktreeRootError({
+			detail: `${label} must resolve to a writable directory (or have a writable existing parent), without broken symlinks.`,
+			reason: "unusable"
+		})
 	});
 	return yield* policy.assertPath({
 		path: canonical,
 		operation
-	}).pipe(effect.Effect.mapError((cause) => new WorktreeRootError({ detail: cause.message })));
+	}).pipe(effect.Effect.mapError(restricted));
 });
 /** Storage selection only: this never grants access to the selected directory's contents. */
 const selectConfiguredWorktreeRoot = (input) => (input.projectId && Object.hasOwn(input.settings.projectWorktreeRoots, input.projectId) ? input.settings.projectWorktreeRoots[input.projectId] : null) || input.settings.worktreeRoot || resolveManagedWorktreesRoot(input.config);
@@ -4094,12 +4203,13 @@ const makeServerSettings = effect.Effect.gen(function* () {
 		updateSettings: (patch) => writeSemaphore.withPermits(1)(effect.Effect.gen(function* () {
 			const current = yield* getSettingsFromCache;
 			const normalizedPatch = { ...patch };
-			const validateRoot = (root) => validateWorktreeRoot(root, worktreeAccessPolicy).pipe(effect.Effect.mapError((cause) => new require_src.ServerSettingsError({
+			const validateRoot = (root, label) => validateWorktreeRoot(root, worktreeAccessPolicy, label).pipe(effect.Effect.mapError((cause) => new require_src.ServerSettingsError({
 				settingsPath,
 				detail: cause.message,
 				cause
 			})));
 			if (patch.worktreeRoot) normalizedPatch.worktreeRoot = yield* validateRoot(patch.worktreeRoot);
+			if (patch.chatsRoot) normalizedPatch.chatsRoot = yield* validateRoot(patch.chatsRoot, "Chats folder");
 			if (patch.projectWorktreeRoots !== void 0) {
 				const roots = [];
 				for (const [id, root] of Object.entries(patch.projectWorktreeRoots)) roots.push([id, root ? yield* validateRoot(root) : null]);
@@ -4422,6 +4532,12 @@ const providerTurnMetricAttributes = (input) => {
 	});
 };
 //#endregion
+Object.defineProperty(exports, "DEFAULT_HUB_CONNECTOR_CONFIG", {
+	enumerable: true,
+	get: function() {
+		return DEFAULT_HUB_CONNECTOR_CONFIG;
+	}
+});
 Object.defineProperty(exports, "DEFAULT_PORT", {
 	enumerable: true,
 	get: function() {
@@ -4746,6 +4862,12 @@ Object.defineProperty(exports, "isStoragePathBlocked", {
 		return isStoragePathBlocked;
 	}
 });
+Object.defineProperty(exports, "isWorktreeRelocationBlocked", {
+	enumerable: true,
+	get: function() {
+		return isWorktreeRelocationBlocked;
+	}
+});
 Object.defineProperty(exports, "makeWorkspaceAccessPolicy", {
 	enumerable: true,
 	get: function() {
@@ -4794,6 +4916,12 @@ Object.defineProperty(exports, "normalizeModelSlug", {
 		return normalizeModelSlug;
 	}
 });
+Object.defineProperty(exports, "noteStorageActivity", {
+	enumerable: true,
+	get: function() {
+		return noteStorageActivity;
+	}
+});
 Object.defineProperty(exports, "orchestrationCommandAckDuration", {
 	enumerable: true,
 	get: function() {
@@ -4938,12 +5066,24 @@ Object.defineProperty(exports, "resolveConfiguredWorktreeRoot", {
 		return resolveConfiguredWorktreeRoot;
 	}
 });
+Object.defineProperty(exports, "resolveExistingAncestor", {
+	enumerable: true,
+	get: function() {
+		return resolveExistingAncestor;
+	}
+});
 Object.defineProperty(exports, "resolveHubConnectorConfig", {
 	enumerable: true,
 	get: function() {
 		return resolveHubConnectorConfig;
 	}
 });
+Object.defineProperty(exports, "resolveManagedChatsRoot", {
+	enumerable: true,
+	get: function() {
+		return resolveManagedChatsRoot;
+	}
+});
 Object.defineProperty(exports, "resolveManagedWorktreesRoot", {
 	enumerable: true,
 	get: function() {
@@ -5034,6 +5174,12 @@ Object.defineProperty(exports, "runtimeQueueRecoveriesTotal", {
 		return runtimeQueueRecoveriesTotal;
 	}
 });
+Object.defineProperty(exports, "sameModelSelection", {
+	enumerable: true,
+	get: function() {
+		return sameModelSelection;
+	}
+});
 Object.defineProperty(exports, "selectConfiguredWorktreeRoot", {
 	enumerable: true,
 	get: function() {
@@ -5064,12 +5210,24 @@ Object.defineProperty(exports, "startupCommandGateQueueWaitDuration", {
 		return startupCommandGateQueueWaitDuration;
 	}
 });
+Object.defineProperty(exports, "storageActivityVersion", {
+	enumerable: true,
+	get: function() {
+		return storageActivityVersion;
+	}
+});
 Object.defineProperty(exports, "storageLifecycleLock", {
 	enumerable: true,
 	get: function() {
 		return storageLifecycleLock;
 	}
 });
+Object.defineProperty(exports, "storagePathBlocker", {
+	enumerable: true,
+	get: function() {
+		return storagePathBlocker;
+	}
+});
 Object.defineProperty(exports, "terminalRestartsTotal", {
 	enumerable: true,
 	get: function() {

package/dist/{NodePTY-D7tFWuQe.mjs → NodePTY-DgnuBruq.mjs}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { h as PtySpawnError, m as PtyAdapter } from "./bin.mjs";
+import { _ as PtySpawnError, g as PtyAdapter } from "./bin.mjs";
 import { createRequire } from "node:module";
 import { Effect, FileSystem, Layer, Path } from "effect";
 //#region src/terminal/Layers/NodePTY.ts