ryco-cli 0.1.22 → 0.1.23

package/dist/bin.cjs

@@ -3,7 +3,7 @@
 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_Metrics = require("./Metrics-DIjMQ5pa.cjs");
+const require_Metrics = require("./Metrics-Bcb9vCAe.cjs");
 const require_SourceControlProviderDiscoveryCatalog = require("./SourceControlProviderDiscoveryCatalog-DreaAH1H.cjs");
 const require_sourceControl = require("./sourceControl-B0D1Op29.cjs");
 let _effect_platform_node_NodeRuntime = require("@effect/platform-node/NodeRuntime");
@@ -34008,7 +34008,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-DWGtHt9r.cjs")),
+			try: () => Promise.resolve().then(() => require("./CodexDriver-CR0S17Lb.cjs")),
 			catch: (cause) => driverImportError(codexDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CodexDriver }) => CodexDriver.create(input)))
 	},
@@ -34022,7 +34022,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-D7NatUx6.cjs")),
+			try: () => Promise.resolve().then(() => require("./ClaudeDriver-B7mbf51W.cjs")),
 			catch: (cause) => driverImportError(claudeDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ ClaudeDriver }) => ClaudeDriver.create(input)))
 	},
@@ -34036,7 +34036,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-DJvYncGI.cjs")),
+			try: () => Promise.resolve().then(() => require("./CopilotDriver-IBd27Ji2.cjs")),
 			catch: (cause) => driverImportError(copilotDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CopilotDriver }) => CopilotDriver.create(input)))
 	},
@@ -34050,7 +34050,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-D3I4KULs.cjs")),
+			try: () => Promise.resolve().then(() => require("./CursorDriver-C4Enoe9N.cjs")),
 			catch: (cause) => driverImportError(cursorDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ CursorDriver }) => CursorDriver.create(input)))
 	},
@@ -34064,7 +34064,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-_puXDTU3.cjs")),
+			try: () => Promise.resolve().then(() => require("./GrokDriver-RyyFeh_q.cjs")),
 			catch: (cause) => driverImportError(grokDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ GrokDriver }) => GrokDriver.create(input)))
 	},
@@ -34078,7 +34078,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-401RexI0.cjs")),
+			try: () => Promise.resolve().then(() => require("./OpenCodeDriver-CDcvPT9v.cjs")),
 			catch: (cause) => driverImportError(openCodeDriverKind, input, cause)
 		}).pipe(effect.Effect.flatMap(({ OpenCodeDriver }) => OpenCodeDriver.create(input)))
 	}
@@ -34793,7 +34793,7 @@ const scopedSafeTeardown = (label) => (effect$28) => effect.Effect.gen(function*
 });
 //#endregion
 //#region package.json
-var version$1 = "0.1.22";
+var version$1 = "0.1.23";
 //#endregion
 //#region src/provider/Layers/CodexProvider.ts
 const PROVIDER_PROBE_TIMEOUT_MS = 8e3;
@@ -40611,8 +40611,8 @@ var QrSegment = class QrSegment {
 	static makeAlphanumeric(text) {
 		if (!QrSegment.isAlphanumeric(text)) throw new RangeError("String contains unencodable characters in alphanumeric mode");
 		let bb = [];
-		let i;
-		for (i = 0; i + 2 <= text.length; i += 2) {
+		let i = 0;
+		for (; i + 2 <= text.length; i += 2) {
 			let temp = QrSegment.ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)) * 45;
 			temp += QrSegment.ALPHANUMERIC_CHARSET.indexOf(text.charAt(i + 1));
 			appendBits(temp, 11, bb);
@@ -41923,7 +41923,8 @@ const COMMIT_TIMEOUT_MS = 6e5;
 const MAX_PROGRESS_TEXT_LENGTH = 500;
 const SHORT_SHA_LENGTH = 7;
 const TOAST_DESCRIPTION_MAX = 72;
-const STATUS_RESULT_CACHE_TTL = effect.Duration.seconds(1);
+const LOCAL_STATUS_RESULT_CACHE_TTL = effect.Duration.seconds(5);
+const REMOTE_STATUS_RESULT_CACHE_TTL = effect.Duration.seconds(30);
 const STATUS_RESULT_CACHE_CAPACITY = 2048;
 function isNotGitRepositoryError(error) {
 	return error.message.toLowerCase().includes("not a git repository");
@@ -42298,7 +42299,7 @@ const makeGitManager = effect.Effect.fn("makeGitManager")(function* () {
 	});
 	const localStatusResultCache = yield* effect.Cache.makeWith(readLocalStatus, {
 		capacity: STATUS_RESULT_CACHE_CAPACITY,
-		timeToLive: (exit) => effect.Exit.isSuccess(exit) ? STATUS_RESULT_CACHE_TTL : effect.Duration.zero
+		timeToLive: (exit) => effect.Exit.isSuccess(exit) ? LOCAL_STATUS_RESULT_CACHE_TTL : effect.Duration.zero
 	});
 	const invalidateLocalStatusResultCache = (cwd) => normalizeStatusCacheKey(cwd).pipe(effect.Effect.flatMap((cacheKey) => effect.Cache.invalidate(localStatusResultCache, cacheKey)));
 	const probeBranchPublished = effect.Effect.fn("probeBranchPublished")(function* (cwd, branch, upstreamRef) {
@@ -42345,7 +42346,7 @@ const makeGitManager = effect.Effect.fn("makeGitManager")(function* () {
 	});
 	const remoteStatusResultCache = yield* effect.Cache.makeWith(readRemoteStatus, {
 		capacity: STATUS_RESULT_CACHE_CAPACITY,
-		timeToLive: (exit) => effect.Exit.isSuccess(exit) ? STATUS_RESULT_CACHE_TTL : effect.Duration.zero
+		timeToLive: (exit) => effect.Exit.isSuccess(exit) ? REMOTE_STATUS_RESULT_CACHE_TTL : effect.Duration.zero
 	});
 	const invalidateRemoteStatusResultCache = (cwd) => normalizeStatusCacheKey(cwd).pipe(effect.Effect.flatMap((cacheKey) => effect.Cache.invalidate(remoteStatusResultCache, cacheKey)));
 	const readConfigValueNullable = (cwd, key) => gitCore.readConfigValue(cwd, key).pipe(effect.Effect.catch(() => effect.Effect.succeed(null)));
@@ -42669,7 +42670,8 @@ const makeGitManager = effect.Effect.fn("makeGitManager")(function* () {
 		return yield* effect.Cache.get(remoteStatusResultCache, cacheKey);
 	});
 	const status = effect.Effect.fn("status")(function* (input) {
-		const [local, remote] = yield* effect.Effect.all([localStatus(input), remoteStatus(input)]);
+		const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
+		const [local, remote] = yield* effect.Effect.all([effect.Cache.get(localStatusResultCache, cacheKey), effect.Cache.get(remoteStatusResultCache, cacheKey)]);
 		return require_Metrics.mergeGitStatusParts(local, remote);
 	});
 	const invalidateLocalStatus = effect.Effect.fn("invalidateLocalStatus")(function* (cwd) {
@@ -42679,8 +42681,8 @@ const makeGitManager = effect.Effect.fn("makeGitManager")(function* () {
 		yield* invalidateRemoteStatusResultCache(cwd);
 	});
 	const invalidateStatus = effect.Effect.fn("invalidateStatus")(function* (cwd) {
-		yield* invalidateLocalStatusResultCache(cwd);
-		yield* invalidateRemoteStatusResultCache(cwd);
+		const cacheKey = yield* normalizeStatusCacheKey(cwd);
+		yield* effect.Effect.all([effect.Cache.invalidate(localStatusResultCache, cacheKey), effect.Cache.invalidate(remoteStatusResultCache, cacheKey)]);
 	});
 	const resolvePullRequest = effect.Effect.fn("resolvePullRequest")(function* (input) {
 		return { pullRequest: yield* (yield* sourceControlProvider(input.cwd)).getChangeRequest({
@@ -43018,10 +43020,15 @@ const DEFAULT_VCS_STATUS_REFRESH_INTERVAL = effect.Duration.seconds(30);
 const VCS_STATUS_REFRESH_FAILURE_BASE_DELAY = effect.Duration.seconds(30);
 const VCS_STATUS_REFRESH_FAILURE_MAX_DELAY = effect.Duration.minutes(15);
 const MAX_REMOTE_REFRESH_CONSECUTIVE_FAILURES = 64;
+const LOCAL_STATUS_CACHE_TTL_MS = effect.Duration.toMillis(effect.Duration.seconds(5));
+const REMOTE_STATUS_CACHE_TTL_MS = effect.Duration.toMillis(effect.Duration.seconds(30));
 var VcsStatusBroadcaster = class extends effect.Context.Service()("ryco/vcs/VcsStatusBroadcaster") {};
 function fingerprintStatusPart(status) {
 	return JSON.stringify(status);
 }
+function isCachedValueFresh(cached, nowMs, ttlMs) {
+	return nowMs - cached.cachedAtMs < ttlMs;
+}
 function normalizeCwd(cwd) {
 	try {
 		return node_fs.realpathSync.native(cwd);
@@ -43041,11 +43048,57 @@ const layer$5 = effect.Layer.effect(VcsStatusBroadcaster, effect.Effect.gen(func
 	const broadcasterScope = yield* effect.Effect.acquireRelease(effect.Scope.make(), (scope) => effect.Scope.close(scope, effect.Exit.void));
 	const cacheRef = yield* effect.Ref.make(/* @__PURE__ */ new Map());
 	const pollersRef = yield* effect.SynchronizedRef.make(/* @__PURE__ */ new Map());
+	const makeStatusSingleFlight = () => effect.Effect.gen(function* () {
+		const flightsRef = yield* effect.SynchronizedRef.make(/* @__PURE__ */ new Map());
+		let requestedVersion = 0;
+		const run = (cwd, kind, operation, retryVersion) => effect.Effect.uninterruptibleMask((restore) => effect.Effect.gen(function* () {
+			const version = retryVersion ?? ++requestedVersion;
+			const candidate = yield* effect.Deferred.make();
+			const selection = yield* effect.SynchronizedRef.modify(flightsRef, (flights) => {
+				const current = flights.get(cwd);
+				if (current) {
+					if (kind === "refresh" && (current.kind === "load" || current.version < version)) return [{
+						_tag: "retryAfter",
+						deferred: current.deferred
+					}, flights];
+					return [{
+						_tag: "await",
+						deferred: current.deferred
+					}, flights];
+				}
+				const nextFlights = new Map(flights);
+				nextFlights.set(cwd, {
+					deferred: candidate,
+					kind,
+					version: requestedVersion
+				});
+				return [{
+					_tag: "owner",
+					deferred: candidate
+				}, nextFlights];
+			});
+			if (selection._tag === "retryAfter") {
+				yield* restore(effect.Deferred.await(selection.deferred)).pipe(effect.Effect.exit);
+				return yield* restore(run(cwd, kind, operation, version));
+			}
+			if (selection._tag === "owner") yield* operation.pipe(effect.Effect.onExit((exit) => effect.SynchronizedRef.update(flightsRef, (flights) => {
+				if (flights.get(cwd)?.deferred !== candidate) return flights;
+				const nextFlights = new Map(flights);
+				nextFlights.delete(cwd);
+				return nextFlights;
+			}).pipe(effect.Effect.andThen(effect.Deferred.done(candidate, exit)))), effect.Effect.ignore, effect.Effect.forkIn(broadcasterScope));
+			return yield* restore(effect.Deferred.await(selection.deferred));
+		}));
+		return run;
+	});
+	const coalesceLocalStatus = yield* makeStatusSingleFlight();
+	const coalesceRemoteStatus = yield* makeStatusSingleFlight();
 	const getCachedStatus = effect.Effect.fn("VcsStatusBroadcaster.getCachedStatus")(function* (cwd) {
 		return yield* effect.Ref.get(cacheRef).pipe(effect.Effect.map((cache) => cache.get(cwd) ?? null));
 	});
 	const updateCachedLocalStatus = effect.Effect.fn("VcsStatusBroadcaster.updateCachedLocalStatus")(function* (cwd, local, options) {
 		const nextLocal = {
+			cachedAtMs: yield* effect.Clock.currentTimeMillis,
 			fingerprint: fingerprintStatusPart(local),
 			value: local
 		};
@@ -43076,7 +43129,9 @@ const layer$5 = effect.Layer.effect(VcsStatusBroadcaster, effect.Effect.gen(func
 		return local;
 	});
 	const updateCachedRemoteStatus = effect.Effect.fn("VcsStatusBroadcaster.updateCachedRemoteStatus")(function* (cwd, remote, options) {
+		const cachedAtMs = yield* effect.Clock.currentTimeMillis;
 		const nextRemote = {
+			cachedAtMs,
 			fingerprint: fingerprintStatusPart(remote),
 			value: remote
 		};
@@ -43089,13 +43144,14 @@ const layer$5 = effect.Layer.effect(VcsStatusBroadcaster, effect.Effect.gen(func
 				...previous,
 				remote: nextRemote
 			};
+			const currentLocal = next.local && isCachedValueFresh(next.local, cachedAtMs, LOCAL_STATUS_CACHE_TTL_MS) ? next.local.value : null;
 			const nextCache = new Map(cache);
 			nextCache.set(cwd, next);
 			return [{
-				changed: previous.remote?.fingerprint !== nextRemote.fingerprint,
-				event: next.local ? {
+				changed: previous.remote?.fingerprint !== nextRemote.fingerprint || !previous.remote || !isCachedValueFresh(previous.remote, cachedAtMs, REMOTE_STATUS_CACHE_TTL_MS),
+				event: currentLocal ? {
 					_tag: "snapshot",
-					local: next.local.value,
+					local: currentLocal,
 					remote
 				} : {
 					_tag: "remoteUpdated",
@@ -43110,21 +43166,27 @@ const layer$5 = effect.Layer.effect(VcsStatusBroadcaster, effect.Effect.gen(func
 		return remote;
 	});
 	const loadLocalStatus = effect.Effect.fn("VcsStatusBroadcaster.loadLocalStatus")(function* (cwd) {
-		const local = yield* workflow.localStatus({ cwd });
-		return yield* updateCachedLocalStatus(cwd, local);
+		return yield* coalesceLocalStatus(cwd, "load", effect.Effect.gen(function* () {
+			const local = yield* workflow.localStatus({ cwd });
+			return yield* updateCachedLocalStatus(cwd, local);
+		}));
 	});
 	const loadRemoteStatus = effect.Effect.fn("VcsStatusBroadcaster.loadRemoteStatus")(function* (cwd) {
-		const remote = yield* workflow.remoteStatus({ cwd });
-		return yield* updateCachedRemoteStatus(cwd, remote);
+		return yield* coalesceRemoteStatus(cwd, "load", effect.Effect.gen(function* () {
+			const remote = yield* workflow.remoteStatus({ cwd });
+			return yield* updateCachedRemoteStatus(cwd, remote);
+		}));
 	});
 	const getOrLoadLocalStatus = effect.Effect.fn("VcsStatusBroadcaster.getOrLoadLocalStatus")(function* (cwd) {
 		const cached = yield* getCachedStatus(cwd);
-		if (cached?.local) return cached.local.value;
+		const nowMs = yield* effect.Clock.currentTimeMillis;
+		if (cached?.local && isCachedValueFresh(cached.local, nowMs, LOCAL_STATUS_CACHE_TTL_MS)) return cached.local.value;
 		return yield* loadLocalStatus(cwd);
 	});
 	const getOrLoadRemoteStatus = effect.Effect.fn("VcsStatusBroadcaster.getOrLoadRemoteStatus")(function* (cwd) {
 		const cached = yield* getCachedStatus(cwd);
-		if (cached?.remote) return cached.remote.value;
+		const nowMs = yield* effect.Clock.currentTimeMillis;
+		if (cached?.remote && isCachedValueFresh(cached.remote, nowMs, REMOTE_STATUS_CACHE_TTL_MS)) return cached.remote.value;
 		return yield* loadRemoteStatus(cwd);
 	});
 	const getStatus = effect.Effect.fn("VcsStatusBroadcaster.getStatus")(function* (input) {
@@ -43134,14 +43196,19 @@ const layer$5 = effect.Layer.effect(VcsStatusBroadcaster, effect.Effect.gen(func
 	});
 	const refreshLocalStatus = effect.Effect.fn("VcsStatusBroadcaster.refreshLocalStatus")(function* (rawCwd) {
 		const cwd = normalizeCwd(rawCwd);
-		yield* workflow.invalidateLocalStatus(cwd);
-		const local = yield* workflow.localStatus({ cwd });
-		return yield* updateCachedLocalStatus(cwd, local, { publish: true });
+		return yield* coalesceLocalStatus(cwd, "refresh", effect.Effect.gen(function* () {
+			yield* workflow.invalidateLocalStatus(cwd);
+			const local = yield* workflow.localStatus({ cwd });
+			return yield* updateCachedLocalStatus(cwd, local, { publish: true });
+		}));
 	});
-	const refreshRemoteStatus = effect.Effect.fn("VcsStatusBroadcaster.refreshRemoteStatus")(function* (cwd) {
-		yield* workflow.invalidateRemoteStatus(cwd);
-		const remote = yield* workflow.remoteStatus({ cwd });
-		return yield* updateCachedRemoteStatus(cwd, remote, { publish: true });
+	const refreshRemoteStatus = effect.Effect.fn("VcsStatusBroadcaster.refreshRemoteStatus")(function* (rawCwd) {
+		const cwd = normalizeCwd(rawCwd);
+		return yield* coalesceRemoteStatus(cwd, "refresh", effect.Effect.gen(function* () {
+			yield* workflow.invalidateRemoteStatus(cwd);
+			const remote = yield* workflow.remoteStatus({ cwd });
+			return yield* updateCachedRemoteStatus(cwd, remote, { publish: true });
+		}));
 	});
 	const refreshStatus = effect.Effect.fn("VcsStatusBroadcaster.refreshStatus")(function* (rawCwd) {
 		const cwd = normalizeCwd(rawCwd);
@@ -43214,17 +43281,24 @@ const layer$5 = effect.Layer.effect(VcsStatusBroadcaster, effect.Effect.gen(func
 		const cwd = normalizeCwd(input.cwd);
 		const subscription = yield* effect.PubSub.subscribe(changesPubSub);
 		const initialLocal = yield* getOrLoadLocalStatus(cwd);
-		const initialRemote = (yield* getCachedStatus(cwd))?.remote?.value ?? null;
+		const cachedRemote = (yield* getCachedStatus(cwd))?.remote ?? null;
+		const nowMs = yield* effect.Clock.currentTimeMillis;
+		const initialRemote = cachedRemote && isCachedValueFresh(cachedRemote, nowMs, REMOTE_STATUS_CACHE_TTL_MS) ? cachedRemote.value : null;
 		const automaticRemoteRefreshInterval = options?.automaticRemoteRefreshInterval ?? effect.Effect.succeed(effect.Duration.zero);
 		const initialRemoteRefreshInterval = yield* automaticRemoteRefreshInterval;
 		const retainedRemotePoller = !effect.Duration.isZero(initialRemoteRefreshInterval);
-		if (retainedRemotePoller) yield* retainRemotePoller(cwd, automaticRemoteRefreshInterval);
-		const release = retainedRemotePoller ? releaseRemotePoller(cwd).pipe(effect.Effect.ignore, effect.Effect.asVoid) : effect.Effect.void;
+		if (retainedRemotePoller) {
+			yield* effect.Effect.acquireRelease(retainRemotePoller(cwd, automaticRemoteRefreshInterval), () => releaseRemotePoller(cwd).pipe(effect.Effect.ignore, effect.Effect.asVoid));
+			yield* options?.afterRemotePollerRetained ?? effect.Effect.void;
+		}
 		return effect.Stream.concat(effect.Stream.make({
 			_tag: "snapshot",
 			local: initialLocal,
 			remote: initialRemote
-		}), effect.Stream.fromSubscription(subscription).pipe(effect.Stream.filter((event) => event.cwd === cwd), effect.Stream.map((event) => event.event))).pipe(effect.Stream.ensuring(release));
+		}), effect.Stream.merge(retainedRemotePoller || initialRemote !== null ? effect.Stream.empty : effect.Stream.fromEffect(getOrLoadRemoteStatus(cwd)).pipe(effect.Stream.map((remote) => ({
+			_tag: "remoteUpdated",
+			remote
+		})), effect.Stream.catchCause(() => effect.Stream.empty)), effect.Stream.fromSubscription(subscription).pipe(effect.Stream.filter((event) => event.cwd === cwd), effect.Stream.map((event) => event.event))));
 	}));
 	return VcsStatusBroadcaster.of({
 		getStatus,