@sanurb/ringi 0.2.1 → 0.3.0

package/dist/runtime.mjs

@@ -2,27 +2,35 @@ import { execFile, spawn } from "node:child_process";
 import { mkdirSync, stat, unwatchFile, watch, watchFile } from "node:fs";
 import * as sp from "node:path";
 import { dirname, join, relative, resolve, sep } from "node:path";
-import * as HttpApiSchema from "@effect/platform/HttpApiSchema";
 import * as Schema from "effect/Schema";
 import { lstat, open, readFile, readdir, realpath, stat as stat$1 } from "node:fs/promises";
 import { randomUUID } from "node:crypto";
+import { ServiceMap } from "effect";
 import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import { DatabaseSync } from "node:sqlite";
 import * as Config from "effect/Config";
 import * as Exit from "effect/Exit";
-import * as Layer from "effect/Layer";
 import "effect/ManagedRuntime";
 import { platform, type } from "node:os";
 import { EventEmitter } from "node:events";
 import { Readable } from "node:stream";
 import * as Queue from "effect/Queue";
-import * as Runtime from "effect/Runtime";
 import * as Stream from "effect/Stream";
 //#region ../../packages/core/src/schemas/review.ts
 const ReviewId = Schema.String.pipe(Schema.brand("ReviewId"));
-const ReviewStatus = Schema.Literal("in_progress", "approved", "changes_requested");
-const ReviewSourceType = Schema.Literal("staged", "branch", "commits");
+const ReviewStatus = Schema.Literals([
+	"in_progress",
+	"approved",
+	"changes_requested"
+]);
+const ReviewSourceType = Schema.Literals([
+	"staged",
+	"branch",
+	"commits",
+	"pull_request"
+]);
 Schema.Struct({
 	baseRef: Schema.NullOr(Schema.String),
 	createdAt: Schema.String,
@@ -35,11 +43,11 @@ Schema.Struct({
 	updatedAt: Schema.String
 });
 Schema.Struct({
-	sourceRef: Schema.optionalWith(Schema.NullOr(Schema.String), { default: () => null }),
-	sourceType: Schema.optionalWith(ReviewSourceType, { default: () => "staged" })
+	sourceRef: Schema.NullOr(Schema.String).pipe(Schema.optionalKey, Schema.withDecodingDefaultKey(() => null)),
+	sourceType: ReviewSourceType.pipe(Schema.optionalKey, Schema.withDecodingDefaultKey(() => "staged"))
 });
-Schema.Struct({ status: Schema.optionalWith(ReviewStatus, { as: "Option" }) });
-var ReviewNotFound = class extends Schema.TaggedError()("ReviewNotFound", { id: ReviewId }, HttpApiSchema.annotations({ status: 404 })) {};
+Schema.Struct({ status: Schema.OptionFromNullOr(ReviewStatus).pipe(Schema.optionalKey) });
+var ReviewNotFound = class extends Schema.TaggedErrorClass()("ReviewNotFound", { id: ReviewId }) {};
 //#endregion
 //#region ../../packages/core/src/schemas/todo.ts
 const TodoId = Schema.String.pipe(Schema.brand("TodoId"));
@@ -53,14 +61,14 @@ Schema.Struct({
 	updatedAt: Schema.String
 });
 Schema.Struct({
-	content: Schema.String.pipe(Schema.minLength(1)),
-	reviewId: Schema.optionalWith(Schema.NullOr(ReviewId), { default: () => null })
+	content: Schema.String.pipe(Schema.check(Schema.isMinLength(1))),
+	reviewId: Schema.NullOr(ReviewId).pipe(Schema.optionalKey, Schema.withDecodingDefaultKey(() => null))
 });
 Schema.Struct({
-	completed: Schema.optionalWith(Schema.Boolean, { as: "Option" }),
-	content: Schema.optionalWith(Schema.String.pipe(Schema.minLength(1)), { as: "Option" })
+	completed: Schema.OptionFromNullOr(Schema.Boolean).pipe(Schema.optionalKey),
+	content: Schema.OptionFromNullOr(Schema.String.pipe(Schema.check(Schema.isMinLength(1)))).pipe(Schema.optionalKey)
 });
-var TodoNotFound = class extends Schema.TaggedError()("TodoNotFound", { id: TodoId }, HttpApiSchema.annotations({ status: 404 })) {};
+var TodoNotFound = class extends Schema.TaggedErrorClass()("TodoNotFound", { id: TodoId }) {};
 //#endregion
 //#region ../../packages/core/src/db/migrations.ts
 const migrations = [
@@ -127,15 +135,17 @@ const withTransaction = (db, body) => Effect.acquireUseRelease(Effect.sync(() =>
 	if (Exit.isSuccess(exit)) db.exec("COMMIT");
 	else db.exec("ROLLBACK");
 }));
-var SqliteService = class extends Effect.Service()("@ringi/SqliteService", { effect: Effect.gen(function* effect() {
-	const dbPath = yield* Config.string("DB_PATH").pipe(Config.withDefault(".ringi/reviews.db"));
-	mkdirSync(dirname(dbPath), { recursive: true });
-	const db = new DatabaseSync(dbPath);
-	db.exec("PRAGMA journal_mode=WAL");
-	db.exec("PRAGMA foreign_keys=ON");
-	runMigrations(db);
-	return { db };
-}) }) {};
+var SqliteService = class SqliteService extends ServiceMap.Service()("@ringi/SqliteService") {
+	static Default = Layer.effect(SqliteService, Effect.gen(function* () {
+		const dbPath = yield* Config.string("DB_PATH").pipe(Config.withDefault(".ringi/reviews.db"));
+		mkdirSync(dirname(dbPath), { recursive: true });
+		const db = new DatabaseSync(dbPath);
+		db.exec("PRAGMA journal_mode=WAL");
+		db.exec("PRAGMA foreign_keys=ON");
+		runMigrations(db);
+		return SqliteService.of({ db });
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/repos/comment.repo.ts
 const rowToComment = (row) => ({
@@ -150,9 +160,8 @@ const rowToComment = (row) => ({
 	suggestion: row.suggestion,
 	updatedAt: row.updated_at
 });
-var CommentRepo = class extends Effect.Service()("@ringi/CommentRepo", {
-	dependencies: [SqliteService.Default],
-	effect: Effect.gen(function* effect() {
+var CommentRepo = class CommentRepo extends ServiceMap.Service()("@ringi/CommentRepo") {
+	static Default = Layer.effect(CommentRepo, Effect.gen(function* () {
 		const { db } = yield* SqliteService;
 		const stmtFindById = db.prepare("SELECT * FROM comments WHERE id = ?");
 		const stmtFindByReview = db.prepare("SELECT * FROM comments WHERE review_id = ? ORDER BY created_at ASC");
@@ -225,7 +234,7 @@ var CommentRepo = class extends Effect.Service()("@ringi/CommentRepo", {
 				withSuggestions: row.with_suggestions
 			};
 		});
-		return {
+		return CommentRepo.of({
 			countByReview,
 			create,
 			findByFile,
@@ -235,13 +244,17 @@ var CommentRepo = class extends Effect.Service()("@ringi/CommentRepo", {
 			removeByReview,
 			setResolved,
 			update
-		};
-	})
-}) {};
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/schemas/comment.ts
 const CommentId = Schema.String.pipe(Schema.brand("CommentId"));
-const LineType = Schema.Literal("added", "removed", "context");
+const LineType = Schema.Literals([
+	"added",
+	"removed",
+	"context"
+]);
 Schema.Struct({
 	content: Schema.String,
 	createdAt: Schema.String,
@@ -255,84 +268,77 @@ Schema.Struct({
 	updatedAt: Schema.String
 });
 Schema.Struct({
-	content: Schema.String.pipe(Schema.minLength(1)),
-	filePath: Schema.String.pipe(Schema.minLength(1)),
-	lineNumber: Schema.optionalWith(Schema.NullOr(Schema.Number), { default: () => null }),
-	lineType: Schema.optionalWith(Schema.NullOr(LineType), { default: () => null }),
-	suggestion: Schema.optionalWith(Schema.NullOr(Schema.String), { default: () => null })
+	content: Schema.String.pipe(Schema.check(Schema.isMinLength(1))),
+	filePath: Schema.String.pipe(Schema.check(Schema.isMinLength(1))),
+	lineNumber: Schema.NullOr(Schema.Number).pipe(Schema.optionalKey, Schema.withDecodingDefaultKey(() => null)),
+	lineType: Schema.NullOr(LineType).pipe(Schema.optionalKey, Schema.withDecodingDefaultKey(() => null)),
+	suggestion: Schema.NullOr(Schema.String).pipe(Schema.optionalKey, Schema.withDecodingDefaultKey(() => null))
 });
 Schema.Struct({
-	content: Schema.optionalWith(Schema.String.pipe(Schema.minLength(1)), { as: "Option" }),
-	suggestion: Schema.optionalWith(Schema.NullOr(Schema.String), { as: "Option" })
+	content: Schema.OptionFromNullOr(Schema.String.pipe(Schema.check(Schema.isMinLength(1)))).pipe(Schema.optionalKey),
+	suggestion: Schema.OptionFromNullOr(Schema.NullOr(Schema.String)).pipe(Schema.optionalKey)
 });
-var CommentNotFound = class extends Schema.TaggedError()("CommentNotFound", { id: CommentId }, HttpApiSchema.annotations({ status: 404 })) {};
+var CommentNotFound = class extends Schema.TaggedErrorClass()("CommentNotFound", { id: CommentId }) {};
 //#endregion
 //#region ../../packages/core/src/services/comment.service.ts
-var CommentService = class extends Effect.Service()("@ringi/CommentService", {
-	dependencies: [CommentRepo.Default],
-	effect: Effect.sync(() => {
-		const create = Effect.fn("CommentService.create")(function* create(reviewId, input) {
-			const repo = yield* CommentRepo;
+var CommentService = class CommentService extends ServiceMap.Service()("@ringi/CommentService") {
+	static Default = Layer.effect(CommentService, Effect.gen(function* () {
+		const repo = yield* CommentRepo;
+		const create = (reviewId, input) => {
 			const id = randomUUID();
-			return yield* repo.create({
+			return repo.create({
 				content: input.content,
 				filePath: input.filePath,
 				id,
-				lineNumber: input.lineNumber,
-				lineType: input.lineType,
+				lineNumber: input.lineNumber ?? null,
+				lineType: input.lineType ?? null,
 				reviewId,
-				suggestion: input.suggestion
+				suggestion: input.suggestion ?? null
 			});
-		});
-		const getById = Effect.fn("CommentService.getById")(function* getById(id) {
-			const comment = yield* (yield* CommentRepo).findById(id);
+		};
+		const getById = (id) => Effect.gen(function* () {
+			const comment = yield* repo.findById(id);
 			if (!comment) return yield* new CommentNotFound({ id });
 			return comment;
 		});
-		const getByReview = Effect.fn("CommentService.getByReview")(function* getByReview(reviewId) {
-			return yield* (yield* CommentRepo).findByReview(reviewId);
-		});
-		const getByFile = Effect.fn("CommentService.getByFile")(function* getByFile(reviewId, filePath) {
-			return yield* (yield* CommentRepo).findByFile(reviewId, filePath);
-		});
-		const update = Effect.fn("CommentService.update")(function* update(id, input) {
-			const repo = yield* CommentRepo;
+		const getByReview = (reviewId) => repo.findByReview(reviewId);
+		const getByFile = (reviewId, filePath) => repo.findByFile(reviewId, filePath);
+		const update = (id, input) => Effect.gen(function* () {
 			const updates = {};
-			if (Option.isSome(input.content)) updates.content = input.content.value;
-			if (Option.isSome(input.suggestion)) updates.suggestion = input.suggestion.value;
+			if (input.content && Option.isSome(input.content)) updates.content = input.content.value;
+			if (input.suggestion && Option.isSome(input.suggestion)) updates.suggestion = input.suggestion.value;
 			const comment = yield* repo.update(id, updates);
 			if (!comment) return yield* new CommentNotFound({ id });
 			return comment;
 		});
-		const resolve = Effect.fn("CommentService.resolve")(function* resolve(id) {
-			const comment = yield* (yield* CommentRepo).setResolved(id, true);
+		const resolve = (id) => Effect.gen(function* () {
+			const comment = yield* repo.setResolved(id, true);
 			if (!comment) return yield* new CommentNotFound({ id });
 			return comment;
 		});
-		const unresolve = Effect.fn("CommentService.unresolve")(function* unresolve(id) {
-			const comment = yield* (yield* CommentRepo).setResolved(id, false);
+		const unresolve = (id) => Effect.gen(function* () {
+			const comment = yield* repo.setResolved(id, false);
 			if (!comment) return yield* new CommentNotFound({ id });
 			return comment;
 		});
-		const remove = Effect.fn("CommentService.remove")(function* remove(id) {
-			if (!(yield* (yield* CommentRepo).remove(id))) return yield* new CommentNotFound({ id });
+		const remove = (id) => Effect.gen(function* () {
+			if (!(yield* repo.remove(id))) return yield* new CommentNotFound({ id });
 			return { success: true };
 		});
-		return {
+		const getStats = (reviewId) => repo.countByReview(reviewId);
+		return CommentService.of({
 			create,
 			getByFile,
 			getById,
 			getByReview,
-			getStats: Effect.fn("CommentService.getStats")(function* getStats(reviewId) {
-				return yield* (yield* CommentRepo).countByReview(reviewId);
-			}),
+			getStats,
 			remove,
 			resolve,
 			unresolve,
 			update
-		};
-	})
-}) {};
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/services/diff.service.ts
 const HUNK_HEADER = /@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
@@ -450,11 +456,13 @@ const getDiffSummary = (files) => {
 };
 //#endregion
 //#region ../../packages/core/src/repos/review-file.repo.ts
-const parseHunks = (hunksData) => hunksData == null ? Effect.succeed([]) : Effect.try(() => JSON.parse(hunksData)).pipe(Effect.orElseSucceed(() => []));
+const parseHunks = (hunksData) => hunksData == null ? Effect.succeed([]) : Effect.try({
+	try: () => JSON.parse(hunksData),
+	catch: () => []
+}).pipe(Effect.orElseSucceed(() => []));
 const serializeHunks = (hunks) => JSON.stringify(hunks);
-var ReviewFileRepo = class extends Effect.Service()("@ringi/ReviewFileRepo", {
-	dependencies: [SqliteService.Default],
-	effect: Effect.gen(function* effect() {
+var ReviewFileRepo = class ReviewFileRepo extends ServiceMap.Service()("@ringi/ReviewFileRepo") {
+	static Default = Layer.effect(ReviewFileRepo, Effect.gen(function* () {
 		const { db } = yield* SqliteService;
 		const stmtFindByReview = db.prepare(`SELECT id, review_id, file_path, old_path, status, additions, deletions, created_at
          FROM review_files WHERE review_id = ? ORDER BY file_path`);
@@ -477,15 +485,15 @@ var ReviewFileRepo = class extends Effect.Service()("@ringi/ReviewFileRepo", {
 		const countByReview = (reviewId) => Effect.sync(() => {
 			return stmtCountByReview.get(reviewId).count;
 		});
-		return {
+		return ReviewFileRepo.of({
 			countByReview,
 			createBulk,
 			deleteByReview,
 			findByReview,
 			findByReviewAndPath
-		};
-	})
-}) {};
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/repos/review.repo.ts
 const rowToReview = (row) => ({
@@ -499,14 +507,14 @@ const rowToReview = (row) => ({
 	status: row.status,
 	updatedAt: row.updated_at
 });
-var ReviewRepo = class extends Effect.Service()("@ringi/ReviewRepo", {
-	dependencies: [SqliteService.Default],
-	effect: Effect.gen(function* effect() {
+var ReviewRepo = class ReviewRepo extends ServiceMap.Service()("@ringi/ReviewRepo") {
+	static Default = Layer.effect(ReviewRepo, Effect.gen(function* () {
 		const { db } = yield* SqliteService;
 		const stmtFindById = db.prepare("SELECT * FROM reviews WHERE id = ?");
 		const stmtInsert = db.prepare(`INSERT INTO reviews (id, repository_path, base_ref, source_type, source_ref, snapshot_data, status, created_at, updated_at)
        VALUES (?, ?, ?, ?, ?, ?, ?, datetime('now'), datetime('now'))`);
 		const stmtUpdate = db.prepare(`UPDATE reviews SET status = COALESCE(?, status), updated_at = datetime('now') WHERE id = ?`);
+		const stmtUpdateSnapshot = db.prepare(`UPDATE reviews SET snapshot_data = ?, updated_at = datetime('now') WHERE id = ?`);
 		const stmtDelete = db.prepare("DELETE FROM reviews WHERE id = ?");
 		const stmtCountAll = db.prepare("SELECT COUNT(*) as count FROM reviews");
 		const stmtCountByStatus = db.prepare("SELECT COUNT(*) as count FROM reviews WHERE status = ?");
@@ -548,6 +556,11 @@ var ReviewRepo = class extends Effect.Service()("@ringi/ReviewRepo", {
 			const row = stmtFindById.get(id);
 			return row ? rowToReview(row) : null;
 		});
+		const updateSnapshotData = (id, snapshotData) => Effect.sync(() => {
+			stmtUpdateSnapshot.run(snapshotData, id);
+			const row = stmtFindById.get(id);
+			return row ? rowToReview(row) : null;
+		});
 		const remove = (id) => Effect.sync(() => {
 			const result = stmtDelete.run(id);
 			return Number(result.changes) > 0;
@@ -558,22 +571,23 @@ var ReviewRepo = class extends Effect.Service()("@ringi/ReviewRepo", {
 		const countByStatus = (status) => Effect.sync(() => {
 			return stmtCountByStatus.get(status).count;
 		});
-		return {
+		return ReviewRepo.of({
 			countAll,
 			countByStatus,
 			create,
 			findAll,
 			findById,
 			remove,
-			update
-		};
-	})
-}) {};
+			update,
+			updateSnapshotData
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/services/git.service.ts
-var GitError = class extends Schema.TaggedError()("GitError", { message: Schema.String }, HttpApiSchema.annotations({ status: 500 })) {};
+var GitError = class extends Schema.TaggedErrorClass()("GitError", { message: Schema.String }) {};
 /** Max bytes to collect from a git command before truncating (200 MB). */
-const MAX_STDOUT_BYTES = 200 * 1024 * 1024;
+const MAX_STDOUT_BYTES$1 = 200 * 1024 * 1024;
 const execGit = (args, repoPath) => Effect.tryPromise({
 	catch: (error) => new GitError({ message: String(error) }),
 	try: () => new Promise((resolve, reject) => {
@@ -584,7 +598,7 @@ const execGit = (args, repoPath) => Effect.tryPromise({
 		child.stdout.on("data", (chunk) => {
 			if (truncated) return;
 			bytes += chunk.length;
-			if (bytes > MAX_STDOUT_BYTES) {
+			if (bytes > MAX_STDOUT_BYTES$1) {
 				truncated = true;
 				child.kill();
 				return;
@@ -616,187 +630,189 @@ const parseNameStatus = (output) => lines(output).map((line) => {
 		status
 	};
 });
-var GitService = class extends Effect.Service()("@ringi/GitService", { effect: Effect.gen(function* effect() {
-	const repoPath = yield* Config.string("REPOSITORY_PATH").pipe(Config.withDefault(process.cwd()));
-	const hasCommits = execGit(["rev-parse", "HEAD"], repoPath).pipe(Effect.as(true), Effect.catchTag("GitError", () => Effect.succeed(false)), Effect.withSpan("GitService.hasCommits"));
-	const getRepositoryInfo = Effect.gen(function* getRepositoryInfo() {
-		const name = yield* execGit(["rev-parse", "--show-toplevel"], repoPath).pipe(Effect.map((s) => s.trim().split("/").pop() ?? "unknown"));
-		return {
-			branch: yield* execGit([
-				"rev-parse",
-				"--abbrev-ref",
-				"HEAD"
-			], repoPath).pipe(Effect.map((s) => s.trim())),
-			name,
-			path: repoPath,
-			remote: yield* execGit([
-				"config",
-				"--get",
-				"remote.origin.url"
-			], repoPath).pipe(Effect.map((s) => s.trim() || null), Effect.catchTag("GitError", () => Effect.succeed(null)))
-		};
-	}).pipe(Effect.withSpan("GitService.getRepositoryInfo"));
-	const getStagedDiff = execGit([
-		"diff",
-		"--cached",
-		"--no-color",
-		"--unified=3"
-	], repoPath).pipe(Effect.withSpan("GitService.getStagedDiff"));
-	const getUncommittedDiff = hasCommits.pipe(Effect.flatMap((has) => has ? execGit([
-		"diff",
-		"HEAD",
-		"--no-color",
-		"--unified=3"
-	], repoPath) : Effect.succeed("")), Effect.withSpan("GitService.getUncommittedDiff"));
-	const getUnstagedDiff = execGit([
-		"diff",
-		"--no-color",
-		"--unified=3"
-	], repoPath).pipe(Effect.withSpan("GitService.getUnstagedDiff"));
-	const getLastCommitDiff = hasCommits.pipe(Effect.flatMap((has) => has ? execGit([
-		"show",
-		"HEAD",
-		"--format=",
-		"--no-color",
-		"--unified=3"
-	], repoPath) : Effect.succeed("")), Effect.withSpan("GitService.getLastCommitDiff"));
-	const getBranchDiff = Effect.fn("GitService.getBranchDiff")(function* getBranchDiff(branch) {
-		return yield* execGit([
+var GitService = class GitService extends ServiceMap.Service()("@ringi/GitService") {
+	static Default = Layer.effect(GitService, Effect.gen(function* () {
+		const repoPath = yield* Config.string("REPOSITORY_PATH").pipe(Config.withDefault(process.cwd()));
+		const hasCommits = execGit(["rev-parse", "HEAD"], repoPath).pipe(Effect.as(true), Effect.catchTag("GitError", () => Effect.succeed(false)), Effect.withSpan("GitService.hasCommits"));
+		const getRepositoryInfo = Effect.gen(function* () {
+			const name = yield* execGit(["rev-parse", "--show-toplevel"], repoPath).pipe(Effect.map((s) => s.trim().split("/").pop() ?? "unknown"));
+			return {
+				branch: yield* execGit([
+					"rev-parse",
+					"--abbrev-ref",
+					"HEAD"
+				], repoPath).pipe(Effect.map((s) => s.trim())),
+				name,
+				path: repoPath,
+				remote: yield* execGit([
+					"config",
+					"--get",
+					"remote.origin.url"
+				], repoPath).pipe(Effect.map((s) => s.trim() || null), Effect.catchTag("GitError", () => Effect.succeed(null)))
+			};
+		}).pipe(Effect.withSpan("GitService.getRepositoryInfo"));
+		const getStagedDiff = execGit([
 			"diff",
-			`${branch}...HEAD`,
+			"--cached",
 			"--no-color",
 			"--unified=3"
-		], repoPath);
-	});
-	const getCommitDiff = Effect.fn("GitService.getCommitDiff")(function* getCommitDiff(shas) {
-		if (shas.length === 1) return yield* execGit([
-			"show",
-			shas[0],
-			"--format=",
+		], repoPath).pipe(Effect.withSpan("GitService.getStagedDiff"));
+		const getUncommittedDiff = hasCommits.pipe(Effect.flatMap((has) => has ? execGit([
+			"diff",
+			"HEAD",
 			"--no-color",
 			"--unified=3"
-		], repoPath);
-		const first = shas.at(-1);
-		const last = shas[0];
-		return yield* execGit([
+		], repoPath) : Effect.succeed("")), Effect.withSpan("GitService.getUncommittedDiff"));
+		const getUnstagedDiff = execGit([
 			"diff",
-			`${first}~1..${last}`,
 			"--no-color",
 			"--unified=3"
-		], repoPath);
-	});
-	const getStagedFiles = execGit([
-		"diff",
-		"--cached",
-		"--name-status"
-	], repoPath).pipe(Effect.map(parseNameStatus), Effect.withSpan("GitService.getStagedFiles"));
-	const getUncommittedFiles = hasCommits.pipe(Effect.flatMap((has) => has ? execGit([
-		"diff",
-		"HEAD",
-		"--name-status"
-	], repoPath).pipe(Effect.map(parseNameStatus)) : Effect.succeed([])), Effect.withSpan("GitService.getUncommittedFiles"));
-	const getUnstagedFiles = execGit(["diff", "--name-status"], repoPath).pipe(Effect.map(parseNameStatus), Effect.withSpan("GitService.getUnstagedFiles"));
-	const getLastCommitFiles = hasCommits.pipe(Effect.flatMap((has) => has ? execGit([
-		"show",
-		"HEAD",
-		"--format=",
-		"--name-status"
-	], repoPath).pipe(Effect.map(parseNameStatus)) : Effect.succeed([])), Effect.withSpan("GitService.getLastCommitFiles"));
-	const getFileContent = Effect.fn("GitService.getFileContent")(function* getFileContent(filePath, version) {
-		switch (version) {
-			case "staged": return yield* execGit(["show", `:${filePath}`], repoPath);
-			case "head": return yield* execGit(["show", `HEAD:${filePath}`], repoPath);
-			default: return yield* Effect.tryPromise({
-				catch: (error) => new GitError({ message: `Failed to read ${filePath}: ${String(error)}` }),
-				try: () => readFile(join(repoPath, filePath), "utf8")
-			});
-		}
-	});
-	const getFileTree = Effect.fn("GitService.getFileTree")(function* getFileTree(ref) {
-		return yield* execGit([
-			"ls-tree",
-			"-r",
-			"--name-only",
-			ref
-		], repoPath).pipe(Effect.map(lines));
-	});
-	const getBranches = execGit(["branch", "--format=%(refname:short)	%(HEAD)"], repoPath).pipe(Effect.map((output) => lines(output).map((line) => {
-		const [name, head] = line.split("	");
-		return {
-			current: head === "*",
-			name
-		};
-	})), Effect.withSpan("GitService.getBranches"));
-	const getCommits = Effect.fn("GitService.getCommits")(function* getCommits(opts) {
-		const limit = (opts.limit ?? 20) + 1;
-		const args = [
-			"log",
-			`--max-count=${limit}`,
-			`--skip=${opts.offset ?? 0}`,
-			"--format=%H	%s	%an	%aI"
-		];
-		if (opts.search) args.push(`--grep=${opts.search}`, "-i");
-		const rows = lines(yield* execGit(args, repoPath));
-		const hasMore = rows.length === limit;
-		return {
-			commits: (hasMore ? rows.slice(0, -1) : rows).map((line) => {
-				const [hash, message, author, date] = line.split("	");
-				return {
-					author,
-					date,
-					hash,
-					message
-				};
-			}),
-			hasMore
-		};
-	});
-	const stageFiles = Effect.fn("GitService.stageFiles")(function* stageFiles(files) {
-		return yield* execGit([
-			"add",
-			"--",
-			...files
-		], repoPath).pipe(Effect.as(files));
-	});
-	const stageAll = execGit(["add", "-A"], repoPath).pipe(Effect.flatMap(() => getStagedFiles), Effect.map((files) => files.map((f) => f.path)), Effect.withSpan("GitService.stageAll"));
-	const unstageFiles = Effect.fn("GitService.unstageFiles")(function* unstageFiles(files) {
-		return yield* execGit([
-			"reset",
+		], repoPath).pipe(Effect.withSpan("GitService.getUnstagedDiff"));
+		const getLastCommitDiff = hasCommits.pipe(Effect.flatMap((has) => has ? execGit([
+			"show",
 			"HEAD",
-			"--",
-			...files
-		], repoPath).pipe(Effect.as(files));
-	});
-	return {
-		getBranchDiff,
-		getBranches,
-		getCommitDiff,
-		getCommits,
-		getFileContent,
-		getFileTree,
-		getLastCommitDiff,
-		getLastCommitFiles,
-		getRepositoryInfo,
-		getRepositoryPath: execGit(["rev-parse", "--show-toplevel"], repoPath).pipe(Effect.map((s) => s.trim()), Effect.withSpan("GitService.getRepositoryPath")),
-		getStagedDiff,
-		getStagedFiles,
-		getUncommittedDiff,
-		getUncommittedFiles,
-		getUnstagedDiff,
-		getUnstagedFiles,
-		hasCommits,
-		stageAll,
-		stageFiles,
-		unstageFiles
-	};
-}) }) {};
+			"--format=",
+			"--no-color",
+			"--unified=3"
+		], repoPath) : Effect.succeed("")), Effect.withSpan("GitService.getLastCommitDiff"));
+		const getBranchDiff = Effect.fn("GitService.getBranchDiff")(function* (branch) {
+			return yield* execGit([
+				"diff",
+				`${branch}...HEAD`,
+				"--no-color",
+				"--unified=3"
+			], repoPath);
+		});
+		const getCommitDiff = Effect.fn("GitService.getCommitDiff")(function* (shas) {
+			if (shas.length === 1) return yield* execGit([
+				"show",
+				shas[0],
+				"--format=",
+				"--no-color",
+				"--unified=3"
+			], repoPath);
+			const first = shas.at(-1);
+			const last = shas[0];
+			return yield* execGit([
+				"diff",
+				`${first}~1..${last}`,
+				"--no-color",
+				"--unified=3"
+			], repoPath);
+		});
+		const getStagedFiles = execGit([
+			"diff",
+			"--cached",
+			"--name-status"
+		], repoPath).pipe(Effect.map(parseNameStatus), Effect.withSpan("GitService.getStagedFiles"));
+		const getUncommittedFiles = hasCommits.pipe(Effect.flatMap((has) => has ? execGit([
+			"diff",
+			"HEAD",
+			"--name-status"
+		], repoPath).pipe(Effect.map(parseNameStatus)) : Effect.succeed([])), Effect.withSpan("GitService.getUncommittedFiles"));
+		const getUnstagedFiles = execGit(["diff", "--name-status"], repoPath).pipe(Effect.map(parseNameStatus), Effect.withSpan("GitService.getUnstagedFiles"));
+		const getLastCommitFiles = hasCommits.pipe(Effect.flatMap((has) => has ? execGit([
+			"show",
+			"HEAD",
+			"--format=",
+			"--name-status"
+		], repoPath).pipe(Effect.map(parseNameStatus)) : Effect.succeed([])), Effect.withSpan("GitService.getLastCommitFiles"));
+		const getFileContent = Effect.fn("GitService.getFileContent")(function* (filePath, version) {
+			switch (version) {
+				case "staged": return yield* execGit(["show", `:${filePath}`], repoPath);
+				case "head": return yield* execGit(["show", `HEAD:${filePath}`], repoPath);
+				default: return yield* Effect.tryPromise({
+					catch: (error) => new GitError({ message: `Failed to read ${filePath}: ${String(error)}` }),
+					try: () => readFile(join(repoPath, filePath), "utf8")
+				});
+			}
+		});
+		const getFileTree = Effect.fn("GitService.getFileTree")(function* (ref) {
+			return yield* execGit([
+				"ls-tree",
+				"-r",
+				"--name-only",
+				ref
+			], repoPath).pipe(Effect.map(lines));
+		});
+		const getBranches = execGit(["branch", "--format=%(refname:short)	%(HEAD)"], repoPath).pipe(Effect.map((output) => lines(output).map((line) => {
+			const [name, head] = line.split("	");
+			return {
+				current: head === "*",
+				name
+			};
+		})), Effect.withSpan("GitService.getBranches"));
+		const getCommits = Effect.fn("GitService.getCommits")(function* (opts) {
+			const limit = (opts.limit ?? 20) + 1;
+			const args = [
+				"log",
+				`--max-count=${limit}`,
+				`--skip=${opts.offset ?? 0}`,
+				"--format=%H	%s	%an	%aI"
+			];
+			if (opts.search) args.push(`--grep=${opts.search}`, "-i");
+			const rows = lines(yield* execGit(args, repoPath));
+			const hasMore = rows.length === limit;
+			return {
+				commits: (hasMore ? rows.slice(0, -1) : rows).map((line) => {
+					const [hash, message, author, date] = line.split("	");
+					return {
+						author,
+						date,
+						hash,
+						message
+					};
+				}),
+				hasMore
+			};
+		});
+		const stageFiles = Effect.fn("GitService.stageFiles")(function* (files) {
+			return yield* execGit([
+				"add",
+				"--",
+				...files
+			], repoPath).pipe(Effect.as(files));
+		});
+		const stageAll = execGit(["add", "-A"], repoPath).pipe(Effect.flatMap(() => getStagedFiles), Effect.map((files) => files.map((f) => f.path)), Effect.withSpan("GitService.stageAll"));
+		const unstageFiles = Effect.fn("GitService.unstageFiles")(function* (files) {
+			return yield* execGit([
+				"reset",
+				"HEAD",
+				"--",
+				...files
+			], repoPath).pipe(Effect.as(files));
+		});
+		const getRepositoryPath = execGit(["rev-parse", "--show-toplevel"], repoPath).pipe(Effect.map((s) => s.trim()), Effect.withSpan("GitService.getRepositoryPath"));
+		return GitService.of({
+			getBranchDiff,
+			getBranches,
+			getCommitDiff,
+			getCommits,
+			getFileContent,
+			getFileTree,
+			getLastCommitDiff,
+			getLastCommitFiles,
+			getRepositoryInfo,
+			getRepositoryPath,
+			getStagedDiff,
+			getStagedFiles,
+			getUncommittedDiff,
+			getUncommittedFiles,
+			getUnstagedDiff,
+			getUnstagedFiles,
+			hasCommits,
+			stageAll,
+			stageFiles,
+			unstageFiles
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/services/review.service.ts
-var ReviewError = class extends Schema.TaggedError()("ReviewError", {
+var ReviewError = class extends Schema.TaggedErrorClass()("ReviewError", {
 	code: Schema.String,
 	message: Schema.String
-}, HttpApiSchema.annotations({ status: 400 })) {};
-/** Get HEAD SHA via git rev-parse. */
+}) {};
 const getHeadSha = (repoPath) => Effect.tryPromise({
 	catch: () => new ReviewError({
 		code: "GIT_ERROR",
@@ -809,23 +825,16 @@ const getHeadSha = (repoPath) => Effect.tryPromise({
 		});
 	})
 });
-/**
-* Parse snapshotData JSON. Handles both v1 and v2 formats gracefully.
-* v1: { files: DiffFile[], repository: {...} }
-* v2: { repository: {...}, version: 2 }
-*/
-const parseSnapshotData = (s) => Effect.try(() => JSON.parse(s)).pipe(Effect.orElseSucceed(() => ({})));
-var ReviewService = class extends Effect.Service()("@ringi/ReviewService", {
-	dependencies: [
-		ReviewRepo.Default,
-		ReviewFileRepo.Default,
-		GitService.Default
-	],
-	effect: Effect.sync(() => {
-		const create = Effect.fn("ReviewService.create")(function* create(input) {
-			const git = yield* GitService;
-			const repo = yield* ReviewRepo;
-			const fileRepo = yield* ReviewFileRepo;
+const parseSnapshotData = (s) => Effect.try({
+	try: () => JSON.parse(s),
+	catch: () => ({})
+}).pipe(Effect.orElseSucceed(() => ({})));
+var ReviewService = class ReviewService extends ServiceMap.Service()("@ringi/ReviewService") {
+	static Default = Layer.effect(ReviewService, Effect.gen(function* () {
+		const git = yield* GitService;
+		const repo = yield* ReviewRepo;
+		const fileRepo = yield* ReviewFileRepo;
+		const create = (input) => Effect.gen(function* () {
 			const repoPath = yield* git.getRepositoryPath;
 			if (!(yield* git.hasCommits)) return yield* new ReviewError({
 				code: "NO_COMMITS",
@@ -903,9 +912,7 @@ var ReviewService = class extends Effect.Service()("@ringi/ReviewService", {
 			yield* fileRepo.createBulk(fileInputs);
 			return review;
 		});
-		const list = Effect.fn("ReviewService.list")(function* list(opts) {
-			const repo = yield* ReviewRepo;
-			const fileRepo = yield* ReviewFileRepo;
+		const list = (opts) => Effect.gen(function* () {
 			const page = opts.page ?? 1;
 			const pageSize = opts.pageSize ?? 20;
 			const result = yield* repo.findAll({
@@ -933,9 +940,7 @@ var ReviewService = class extends Effect.Service()("@ringi/ReviewService", {
 				total: result.total
 			};
 		});
-		const getById = Effect.fn("ReviewService.getById")(function* getById(id) {
-			const repo = yield* ReviewRepo;
-			const fileRepo = yield* ReviewFileRepo;
+		const getById = (id) => Effect.gen(function* () {
 			const review = yield* repo.findById(id);
 			if (!review) return yield* new ReviewNotFound({ id });
 			const files = (yield* fileRepo.findByReview(id)).map((r) => ({
@@ -962,10 +967,7 @@ var ReviewService = class extends Effect.Service()("@ringi/ReviewService", {
 				summary
 			};
 		});
-		const getFileHunks = Effect.fn("ReviewService.getFileHunks")(function* getFileHunks(reviewId, filePath) {
-			const repo = yield* ReviewRepo;
-			const fileRepo = yield* ReviewFileRepo;
-			const git = yield* GitService;
+		const getFileHunks = (reviewId, filePath) => Effect.gen(function* () {
 			const review = yield* repo.findById(reviewId);
 			if (!review) return yield* new ReviewNotFound({ id: reviewId });
 			const fileRecord = yield* fileRepo.findByReviewAndPath(reviewId, filePath);
@@ -979,43 +981,40 @@ var ReviewService = class extends Effect.Service()("@ringi/ReviewService", {
 			if (snapshot.files) return snapshot.files.find((f) => f.newPath === filePath)?.hunks ?? [];
 			return [];
 		});
-		const update = Effect.fn("ReviewService.update")(function* update(id, input) {
-			const repo = yield* ReviewRepo;
+		const update = (id, input) => Effect.gen(function* () {
 			if (!(yield* repo.findById(id))) return yield* new ReviewNotFound({ id });
-			const status = Option.getOrNull(input.status);
+			const status = input.status ? Option.getOrNull(input.status) : null;
 			const review = yield* repo.update(id, status);
 			if (!review) return yield* new ReviewNotFound({ id });
 			return review;
 		});
-		const remove = Effect.fn("ReviewService.remove")(function* remove(id) {
-			const repo = yield* ReviewRepo;
-			const fileRepo = yield* ReviewFileRepo;
+		const remove = (id) => Effect.gen(function* () {
 			if (!(yield* repo.findById(id))) return yield* new ReviewNotFound({ id });
 			yield* fileRepo.deleteByReview(id);
 			yield* repo.remove(id);
 			return { success: true };
 		});
-		return {
+		const getStats = () => Effect.gen(function* () {
+			const total = yield* repo.countAll();
+			const inProgress = yield* repo.countByStatus("in_progress");
+			return {
+				approved: yield* repo.countByStatus("approved"),
+				changesRequested: yield* repo.countByStatus("changes_requested"),
+				inProgress,
+				total
+			};
+		});
+		return ReviewService.of({
 			create,
 			getById,
 			getFileHunks,
-			getStats: Effect.fn("ReviewService.getStats")(function* getStats() {
-				const repo = yield* ReviewRepo;
-				const total = yield* repo.countAll();
-				const inProgress = yield* repo.countByStatus("in_progress");
-				return {
-					approved: yield* repo.countByStatus("approved"),
-					changesRequested: yield* repo.countByStatus("changes_requested"),
-					inProgress,
-					total
-				};
-			}),
+			getStats,
 			list,
 			remove,
 			update
-		};
-	})
-}) {};
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/repos/todo.repo.ts
 const rowToTodo = (row) => ({
@@ -1027,9 +1026,8 @@ const rowToTodo = (row) => ({
 	reviewId: row.review_id,
 	updatedAt: row.updated_at
 });
-var TodoRepo = class extends Effect.Service()("@ringi/TodoRepo", {
-	dependencies: [SqliteService.Default],
-	effect: Effect.gen(function* effect() {
+var TodoRepo = class TodoRepo extends ServiceMap.Service()("@ringi/TodoRepo") {
+	static Default = Layer.effect(TodoRepo, Effect.gen(function* () {
 		const { db } = yield* SqliteService;
 		const stmtFindById = db.prepare("SELECT * FROM todos WHERE id = ?");
 		const stmtInsert = db.prepare(`INSERT INTO todos (id, content, completed, review_id, position, created_at, updated_at)
@@ -1118,7 +1116,7 @@ var TodoRepo = class extends Effect.Service()("@ringi/TodoRepo", {
 			}
 			return updated;
 		}));
-		const move = (id, newPosition) => Effect.gen(function* move() {
+		const move = (id, newPosition) => Effect.gen(function* () {
 			const row = stmtFindById.get(id);
 			if (!row) return null;
 			const oldPosition = row.position;
@@ -1138,7 +1136,7 @@ var TodoRepo = class extends Effect.Service()("@ringi/TodoRepo", {
 		const countPending = () => Effect.sync(() => {
 			return stmtCountPending.get().count;
 		});
-		return {
+		return TodoRepo.of({
 			countAll,
 			countCompleted,
 			countPending,
@@ -1151,30 +1149,29 @@ var TodoRepo = class extends Effect.Service()("@ringi/TodoRepo", {
 			reorder,
 			toggle,
 			update
-		};
-	})
-}) {};
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/services/todo.service.ts
-var TodoService = class extends Effect.Service()("@ringi/TodoService", {
-	dependencies: [TodoRepo.Default],
-	effect: Effect.sync(() => {
-		const create = Effect.fn("TodoService.create")(function* create(input) {
-			const repo = yield* TodoRepo;
+var TodoService = class TodoService extends ServiceMap.Service()("@ringi/TodoService") {
+	static Default = Layer.effect(TodoService, Effect.gen(function* () {
+		const repo = yield* TodoRepo;
+		const create = (input) => {
 			const id = randomUUID();
-			return yield* repo.create({
+			return repo.create({
 				content: input.content,
 				id,
-				reviewId: input.reviewId
+				reviewId: input.reviewId ?? null
 			});
-		});
-		const getById = Effect.fn("TodoService.getById")(function* getById(id) {
-			const todo = yield* (yield* TodoRepo).findById(id);
+		};
+		const getById = (id) => Effect.gen(function* () {
+			const todo = yield* repo.findById(id);
 			if (!todo) return yield* new TodoNotFound({ id });
 			return todo;
 		});
-		const list = Effect.fn("TodoService.list")(function* list(opts = {}) {
-			const result = yield* (yield* TodoRepo).findAll(opts);
+		const list = (opts = {}) => Effect.gen(function* () {
+			const result = yield* repo.findAll(opts);
 			return {
 				data: result.data,
 				limit: opts.limit ?? null,
@@ -1182,50 +1179,48 @@ var TodoService = class extends Effect.Service()("@ringi/TodoService", {
 				total: result.total
 			};
 		});
-		const update = Effect.fn("TodoService.update")(function* update(id, input) {
-			const repo = yield* TodoRepo;
+		const update = (id, input) => Effect.gen(function* () {
 			if (!(yield* repo.findById(id))) return yield* new TodoNotFound({ id });
 			const updates = {};
-			if (Option.isSome(input.content)) updates.content = input.content.value;
-			if (Option.isSome(input.completed)) updates.completed = input.completed.value;
+			if (input.content && Option.isSome(input.content)) updates.content = input.content.value;
+			if (input.completed && Option.isSome(input.completed)) updates.completed = input.completed.value;
 			const todo = yield* repo.update(id, updates);
 			if (!todo) return yield* new TodoNotFound({ id });
 			return todo;
 		});
-		const toggle = Effect.fn("TodoService.toggle")(function* toggle(id) {
-			const todo = yield* (yield* TodoRepo).toggle(id);
+		const toggle = (id) => Effect.gen(function* () {
+			const todo = yield* repo.toggle(id);
 			if (!todo) return yield* new TodoNotFound({ id });
 			return todo;
 		});
-		const remove = Effect.fn("TodoService.remove")(function* remove(id) {
-			const repo = yield* TodoRepo;
+		const remove = (id) => Effect.gen(function* () {
 			if (!(yield* repo.findById(id))) return yield* new TodoNotFound({ id });
 			yield* repo.remove(id);
 			return { success: true };
 		});
-		const removeCompleted = Effect.fn("TodoService.removeCompleted")(function* removeCompleted() {
-			return { deleted: yield* (yield* TodoRepo).removeCompleted() };
+		const removeCompleted = () => Effect.gen(function* () {
+			return { deleted: yield* repo.removeCompleted() };
 		});
-		const reorder = Effect.fn("TodoService.reorder")(function* reorder(orderedIds) {
-			return { updated: yield* (yield* TodoRepo).reorder(orderedIds) };
+		const reorder = (orderedIds) => Effect.gen(function* () {
+			return { updated: yield* repo.reorder(orderedIds) };
 		});
-		const move = Effect.fn("TodoService.move")(function* move(id, position) {
-			const todo = yield* (yield* TodoRepo).move(id, position);
+		const move = (id, position) => Effect.gen(function* () {
+			const todo = yield* repo.move(id, position);
 			if (!todo) return yield* new TodoNotFound({ id });
 			return todo;
 		});
-		return {
+		const getStats = () => Effect.gen(function* () {
+			const total = yield* repo.countAll();
+			return {
+				completed: yield* repo.countCompleted(),
+				pending: yield* repo.countPending(),
+				total
+			};
+		});
+		return TodoService.of({
 			create,
 			getById,
-			getStats: Effect.fn("TodoService.getStats")(function* getStats() {
-				const repo = yield* TodoRepo;
-				const total = yield* repo.countAll();
-				return {
-					completed: yield* repo.countCompleted(),
-					pending: yield* repo.countPending(),
-					total
-				};
-			}),
+			getStats,
 			list,
 			move,
 			remove,
@@ -1233,22 +1228,17 @@ var TodoService = class extends Effect.Service()("@ringi/TodoService", {
 			reorder,
 			toggle,
 			update
-		};
-	})
-}) {};
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/services/export.service.ts
-var ExportService = class extends Effect.Service()("@ringi/ExportService", {
-	dependencies: [
-		ReviewService.Default,
-		CommentService.Default,
-		TodoService.Default
-	],
-	effect: Effect.sync(() => {
-		return { exportReview: Effect.fn("ExportService.exportReview")(function* exportReview(reviewId) {
-			const reviewSvc = yield* ReviewService;
-			const commentSvc = yield* CommentService;
-			const todoSvc = yield* TodoService;
+var ExportService = class ExportService extends ServiceMap.Service()("@ringi/ExportService") {
+	static Default = Layer.effect(ExportService, Effect.gen(function* () {
+		const reviewSvc = yield* ReviewService;
+		const commentSvc = yield* CommentService;
+		const todoSvc = yield* TodoService;
+		const exportReview = (reviewId) => Effect.gen(function* () {
 			const review = yield* reviewSvc.getById(reviewId);
 			const repo = review.repository;
 			const repoName = repo?.name ?? "Unknown";
@@ -1313,9 +1303,154 @@ var ExportService = class extends Effect.Service()("@ringi/ExportService", {
 			}
 			lines.push("");
 			return lines.join("\n");
-		}) };
-	})
+		});
+		return ExportService.of({ exportReview });
+	}));
+};
+//#endregion
+//#region ../../packages/core/src/services/gh.service.ts
+var GhNotInstalled = class extends Schema.TaggedErrorClass()("GhNotInstalled", { message: Schema.String }) {};
+var GhAuthError = class extends Schema.TaggedErrorClass()("GhAuthError", {
+	host: Schema.String,
+	message: Schema.String
+}) {};
+var GhApiError = class extends Schema.TaggedErrorClass()("GhApiError", {
+	message: Schema.String,
+	statusCode: Schema.NullOr(Schema.Number)
 }) {};
+/** Max bytes to collect from gh output (50 MB — PR diffs can be large). */
+const MAX_STDOUT_BYTES = 50 * 1024 * 1024;
+const execGh = (args) => Effect.tryPromise({
+	catch: (error) => new GhApiError({
+		message: String(error),
+		statusCode: null
+	}),
+	try: () => new Promise((resolve, reject) => {
+		const child = spawn("gh", [...args], { stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		] });
+		const chunks = [];
+		let bytes = 0;
+		let truncated = false;
+		child.stdout.on("data", (chunk) => {
+			if (truncated) return;
+			bytes += chunk.length;
+			if (bytes > MAX_STDOUT_BYTES) {
+				truncated = true;
+				child.kill();
+				return;
+			}
+			chunks.push(chunk);
+		});
+		let stderr = "";
+		child.stderr.on("data", (chunk) => {
+			stderr += chunk.toString();
+		});
+		child.on("error", (err) => {
+			reject(/* @__PURE__ */ new Error(`Failed to spawn gh: ${err.message}`));
+		});
+		child.on("close", (code) => {
+			if (truncated) {
+				resolve(Buffer.concat(chunks).toString("utf8"));
+				return;
+			}
+			if (code !== 0) reject(/* @__PURE__ */ new Error(`gh ${args[0]} exited with code ${code}: ${stderr}`));
+			else resolve(Buffer.concat(chunks).toString("utf8"));
+		});
+	})
+});
+/** PR metadata fields requested from gh in a single JSON call. */
+const PR_JSON_FIELDS = [
+	"additions",
+	"author",
+	"baseRefName",
+	"baseRefOid",
+	"body",
+	"changedFiles",
+	"createdAt",
+	"deletions",
+	"headRefName",
+	"headRefOid",
+	"headRepository",
+	"isDraft",
+	"mergeable",
+	"number",
+	"reviewDecision",
+	"state",
+	"title",
+	"updatedAt",
+	"url"
+].join(",");
+var GhService = class GhService extends ServiceMap.Service()("@ringi/GhService") {
+	static Default = Layer.effect(GhService, Effect.gen(function* () {
+		const ensureInstalled = execGh(["version"]).pipe(Effect.asVoid, Effect.mapError(() => new GhNotInstalled({ message: "GitHub CLI (gh) not found. Install: https://cli.github.com" })), Effect.withSpan("GhService.ensureInstalled"));
+		const ensureAuthenticated = Effect.fn("GhService.ensureAuthenticated")(function* (host) {
+			yield* execGh([
+				"auth",
+				"status",
+				"--hostname",
+				host
+			]).pipe(Effect.asVoid, Effect.mapError(() => new GhAuthError({
+				host,
+				message: `Not authenticated to ${host}. Run: gh auth login --hostname ${host}`
+			})));
+		});
+		const fetchPrMetadata = Effect.fn("GhService.fetchPrMetadata")(function* (target) {
+			const json = yield* execGh([
+				"pr",
+				"view",
+				String(target.prNumber),
+				"--repo",
+				target.nwoRef,
+				"--json",
+				PR_JSON_FIELDS
+			]);
+			return yield* Effect.try({
+				catch: () => new GhApiError({
+					message: "Failed to parse PR metadata JSON from gh output",
+					statusCode: null
+				}),
+				try: () => JSON.parse(json)
+			});
+		});
+		const fetchPrDiff = Effect.fn("GhService.fetchPrDiff")(function* (target) {
+			return yield* execGh([
+				"pr",
+				"diff",
+				String(target.prNumber),
+				"--repo",
+				target.nwoRef
+			]);
+		});
+		const fetchPrHeadOid = Effect.fn("GhService.fetchPrHeadOid")(function* (target) {
+			const json = yield* execGh([
+				"pr",
+				"view",
+				String(target.prNumber),
+				"--repo",
+				target.nwoRef,
+				"--json",
+				"headRefOid"
+			]);
+			return yield* Effect.try({
+				catch: () => new GhApiError({
+					message: "Failed to parse head OID from gh output",
+					statusCode: null
+				}),
+				try: () => JSON.parse(json).headRefOid
+			});
+		});
+		return GhService.of({
+			ensureAuthenticated,
+			ensureInstalled,
+			fetchPrDiff,
+			fetchPrHeadOid,
+			fetchPrMetadata
+		});
+	}));
+};
 //#endregion
 //#region ../../node_modules/.pnpm/readdirp@5.0.0/node_modules/readdirp/index.js
 const EntryTypes = {
@@ -2909,67 +3044,73 @@ var chokidar_default = {
 };
 //#endregion
 //#region ../../packages/core/src/services/event.service.ts
-var EventService = class extends Effect.Service()("@ringi/EventService", { effect: Effect.gen(function* effect() {
-	const rt = yield* Effect.runtime();
-	const runFork = Runtime.runFork(rt);
-	const subscribers = /* @__PURE__ */ new Set();
-	const broadcast = Effect.fn("EventService.broadcast")(function* broadcast(type, data) {
-		const event = {
-			data,
-			timestamp: Date.now(),
-			type
-		};
-		for (const queue of subscribers) yield* Queue.offer(queue, event);
-	});
-	const subscribe = Effect.fn("EventService.subscribe")(function* subscribe() {
-		const queue = yield* Queue.sliding(100);
-		subscribers.add(queue);
-		return {
-			stream: Stream.fromQueue(queue),
-			unsubscribe: Effect.sync(() => {
-				subscribers.delete(queue);
-			}).pipe(Effect.andThen(Queue.shutdown(queue)))
-		};
-	});
-	const startFileWatcher = (repoPath) => Effect.acquireRelease(Effect.sync(() => {
-		let debounceTimer = null;
-		const watcher = chokidar_default.watch(repoPath, {
-			ignoreInitial: true,
-			ignored: [
-				"**/node_modules/**",
-				"**/.git/**",
-				"**/.ringi/**",
-				"**/dist/**"
-			],
-			persistent: true,
-			...platform() === "darwin" ? {
-				interval: 1e3,
-				usePolling: true
-			} : {}
-		});
-		const debouncedBroadcast = (filePath) => {
-			if (debounceTimer) clearTimeout(debounceTimer);
-			debounceTimer = setTimeout(() => {
-				runFork(broadcast("files", { path: relative(repoPath, filePath) }));
-			}, 300);
-		};
-		watcher.on("add", debouncedBroadcast);
-		watcher.on("change", debouncedBroadcast);
-		watcher.on("unlink", debouncedBroadcast);
-		return watcher;
-	}), (watcher) => Effect.promise(() => watcher.close()));
-	const getClientCount = () => Effect.sync(() => subscribers.size);
-	return {
-		broadcast,
-		getClientCount,
-		startFileWatcher,
-		subscribe
-	};
-}) }) {};
+var EventService = class EventService extends ServiceMap.Service()("@ringi/EventService") {
+	static Default = Layer.effect(EventService, Effect.sync(() => {
+		const subscribers = /* @__PURE__ */ new Set();
+		const broadcast = (type, data) => Effect.gen(function* () {
+			const event = {
+				data,
+				timestamp: Date.now(),
+				type
+			};
+			for (const queue of subscribers) yield* Queue.offer(queue, event);
+		});
+		const subscribe = () => Effect.gen(function* () {
+			const queue = yield* Queue.sliding(100);
+			subscribers.add(queue);
+			return {
+				stream: Stream.fromQueue(queue),
+				unsubscribe: Effect.sync(() => {
+					subscribers.delete(queue);
+				}).pipe(Effect.andThen(Queue.shutdown(queue)))
+			};
+		});
+		const startFileWatcher = (repoPath) => Effect.acquireRelease(Effect.sync(() => {
+			let debounceTimer = null;
+			const watcher = chokidar_default.watch(repoPath, {
+				ignoreInitial: true,
+				ignored: [
+					"**/node_modules/**",
+					"**/.git/**",
+					"**/.ringi/**",
+					"**/dist/**"
+				],
+				persistent: true,
+				...platform() === "darwin" ? {
+					interval: 1e3,
+					usePolling: true
+				} : {}
+			});
+			const debouncedBroadcast = (filePath) => {
+				if (debounceTimer) clearTimeout(debounceTimer);
+				debounceTimer = setTimeout(() => {
+					const rel = relative(repoPath, filePath);
+					Effect.runFork(broadcast("files", { path: rel }));
+				}, 300);
+			};
+			watcher.on("add", debouncedBroadcast);
+			watcher.on("change", debouncedBroadcast);
+			watcher.on("unlink", debouncedBroadcast);
+			return watcher;
+		}), (watcher) => Effect.promise(() => watcher.close()));
+		const getClientCount = () => Effect.sync(() => subscribers.size);
+		return EventService.of({
+			broadcast,
+			getClientCount,
+			startFileWatcher,
+			subscribe
+		});
+	}));
+};
 //#endregion
 //#region ../../packages/core/src/runtime.ts
-const CoreLive = Layer.mergeAll(ReviewService.Default, ReviewRepo.Default, ReviewFileRepo.Default, CommentService.Default, CommentRepo.Default, TodoService.Default, TodoRepo.Default, GitService.Default, EventService.Default, ExportService.Default, SqliteService.Default);
+const RepoLive = Layer.mergeAll(ReviewRepo.Default, ReviewFileRepo.Default, CommentRepo.Default, TodoRepo.Default).pipe(Layer.provide(SqliteService.Default));
+const CommentServiceLive = CommentService.Default.pipe(Layer.provide(CommentRepo.Default), Layer.provide(SqliteService.Default));
+const TodoServiceLive = TodoService.Default.pipe(Layer.provide(TodoRepo.Default), Layer.provide(SqliteService.Default));
+const ReviewServiceLive = ReviewService.Default.pipe(Layer.provide(ReviewRepo.Default), Layer.provide(ReviewFileRepo.Default), Layer.provide(GitService.Default), Layer.provide(SqliteService.Default));
+const ExportServiceLive = ExportService.Default.pipe(Layer.provide(ReviewServiceLive), Layer.provide(CommentServiceLive), Layer.provide(TodoServiceLive));
+const CoreLive = Layer.mergeAll(ReviewServiceLive, CommentServiceLive, TodoServiceLive, GitService.Default, GhService.Default, EventService.Default, ExportServiceLive, RepoLive, SqliteService.Default);
 //#endregion
-export { GitService as a, CommentService as c, ReviewId as d, ReviewNotFound as f, ReviewService as i, TodoId as l, ExportService as n, getDiffSummary as o, ReviewSourceType as p, TodoService as r, parseDiff as s, CoreLive as t, TodoNotFound as u };
+export { ReviewSourceType as _, ReviewService as a, ReviewFileRepo as c, parseDiff as d, CommentService as f, ReviewNotFound as g, ReviewId as h, TodoService as i, serializeHunks as l, TodoNotFound as m, GhService as n, GitService as o, TodoId as p, ExportService as r, ReviewRepo as s, CoreLive as t, getDiffSummary as u };
 
 //# sourceMappingURL=runtime.mjs.map