@blogic-cz/agent-tools 1.7.5 → 1.8.0

package/src/gh-tool/branch.ts

@@ -3,7 +3,9 @@ import { Effect, Option } from "effect";
 
 import { formatOption, logFormatted } from "#shared";
 import type { BranchRenameResult } from "./types";
-import { GitHubService } from "./service";
+import { writes } from "./read/writes";
+import { resolveRepo } from "./read/reads";
+import { repoSlug } from "./read/keys";
 
 // ---------------------------------------------------------------------------
 // Internal handlers
@@ -15,8 +17,6 @@ export const renameBranch = Effect.fn("branch.renameBranch")(function* (opts: {
   confirm: boolean;
   repo: string | null;
 }) {
-  const gh = yield* GitHubService;
-
   if (!opts.confirm) {
     const scope = opts.repo !== null ? ` in ${opts.repo}` : "";
 
@@ -31,10 +31,7 @@ export const renameBranch = Effect.fn("branch.renameBranch")(function* (opts: {
     return dryRun;
   }
 
-  const repoInfo =
-    opts.repo !== null
-      ? opts.repo
-      : yield* gh.getRepoInfo().pipe(Effect.map((r) => `${r.owner}/${r.name}`));
+  const repoInfo = opts.repo !== null ? opts.repo : repoSlug(yield* resolveRepo(null));
 
   const args = [
     "api",
@@ -45,7 +42,7 @@ export const renameBranch = Effect.fn("branch.renameBranch")(function* (opts: {
     `new_name=${opts.newName}`,
   ];
 
-  yield* gh.runGh(args);
+  yield* writes.run(args, [`repo:${repoInfo.toLowerCase()}`]);
 
   const result: BranchRenameResult = {
     renamed: true,

package/src/gh-tool/environment.ts

@@ -41,10 +41,11 @@ const GH_ENVIRONMENT_NAMES = [
 
 export const ghEnvironment = (
   environment: Record<string, string | undefined> = process.env,
+  credential: string | null = null,
 ): Record<string, string> =>
   Object.fromEntries(
     GH_ENVIRONMENT_NAMES.flatMap((name) => {
-      const value = environment[name];
+      const value = name === "GH_TOKEN" && credential !== null ? credential : environment[name];
       return value === undefined ? [] : [[name, value]];
     }),
   );

package/src/gh-tool/gist.ts

@@ -1,3 +1,6 @@
+import { passthrough } from "./read/catalog";
+import type { GistApi } from "./read/catalog";
+import { writes } from "./read/writes";
 import { Command, Flag } from "effect/cli";
 import { Effect, Option } from "effect";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
@@ -11,33 +14,12 @@ import {
   resolveOptionalTextInput,
 } from "#gh/text-input";
 import { GitHubCommandError } from "./errors";
-import { GitHubService } from "./service";
 
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
 
 // `gh gist list/view` have no --json, so reads go through `gh api gists` (REST shape).
-type GistApiFile = {
-  filename: string;
-  language: string | null;
-  type: string;
-  size: number;
-  truncated?: boolean;
-  content?: string;
-};
-
-type GistApi = {
-  id: string;
-  description: string | null;
-  public: boolean;
-  html_url: string;
-  created_at: string;
-  updated_at: string;
-  owner: { login: string } | null;
-  files: Record<string, GistApiFile>;
-};
-
 type GistListItem = {
   id: string;
   description: string | null;
@@ -247,9 +229,7 @@ const listGists = Effect.fn("gist.listGists")(function* (opts: {
   limit: number;
   visibility: string | null;
 }) {
-  const gh = yield* GitHubService;
-
-  const gists = yield* gh.runGhJson<GistApi[]>(["api", `gists?per_page=${opts.limit}`]);
+  const gists = yield* passthrough.gistList(opts.limit);
 
   return gists
     .filter(
@@ -264,9 +244,7 @@ const viewGist = Effect.fn("gist.viewGist")(function* (opts: {
   filename: string | null;
   withContent: boolean;
 }) {
-  const gh = yield* GitHubService;
-
-  const gist = yield* gh.runGhJson<GistApi>(["api", `gists/${opts.id}`]);
+  const gist = yield* passthrough.gistView(opts.id);
 
   return toGistDetail(gist, { filename: opts.filename, withContent: opts.withContent });
 });
@@ -276,7 +254,6 @@ export const createGist = Effect.fn("gist.createGist")(function* (opts: {
   description: string | null;
   public: boolean;
 }) {
-  const gh = yield* GitHubService;
   return yield* Effect.scoped(
     Effect.gen(function* () {
       const snapshots: string[] = [];
@@ -298,7 +275,7 @@ export const createGist = Effect.fn("gist.createGist")(function* (opts: {
         args.push("--public");
       }
 
-      const result = yield* gh.runGh(args);
+      const result = yield* writes.run(args, []);
       const url =
         result.stdout
           .trim()
@@ -333,8 +310,6 @@ export const editGist = Effect.fn("gist.editGist")(function* (opts: {
   filename: string | null;
   sourcePath: string | null;
 }) {
-  const gh = yield* GitHubService;
-
   const args = ["gist", "edit", opts.id];
   const changes: string[] = [];
 
@@ -371,7 +346,7 @@ export const editGist = Effect.fn("gist.editGist")(function* (opts: {
     args.push("--filename", opts.filename);
   }
 
-  yield* gh.runGh(args);
+  yield* writes.run(args, []);
 
   const edited: GistEditResult = { edited: true, id: opts.id, changes };
 
@@ -379,8 +354,6 @@ export const editGist = Effect.fn("gist.editGist")(function* (opts: {
 });
 
 const deleteGist = Effect.fn("gist.deleteGist")(function* (opts: { id: string; confirm: boolean }) {
-  const gh = yield* GitHubService;
-
   if (!opts.confirm) {
     const dryRun: GistDeleteResult = {
       deleted: false,
@@ -392,7 +365,7 @@ const deleteGist = Effect.fn("gist.deleteGist")(function* (opts: { id: string; c
     return dryRun;
   }
 
-  yield* gh.runGh(["gist", "delete", opts.id, "--yes"]);
+  yield* writes.run(["gist", "delete", opts.id, "--yes"], []);
 
   const deleted: GistDeleteResult = { deleted: true, id: opts.id };
 

package/src/gh-tool/issue/commands.ts

@@ -18,7 +18,7 @@ import {
   reopenIssue,
   viewIssue,
 } from "./core";
-import { GitHubService } from "#gh/service";
+import { GitHubService } from "#gh/read/transport";
 
 const repoOption = Flag.String("repo").pipe(
   Flag.withDescription("Target repository profile name or owner/name"),

package/src/gh-tool/issue/core.ts

@@ -3,7 +3,11 @@ import { Effect } from "effect";
 import type { GitHubIssueCommentUrl, IssueComment, IssueCommentId, IsoTimestamp } from "#gh/types";
 
 import { GitHubCommandError } from "#gh/errors";
-import { GitHubService } from "#gh/service";
+import { GitHubService } from "#gh/read/transport";
+import { reads, resolveRepo } from "#gh/read/reads";
+import { writes } from "#gh/read/writes";
+import { project } from "#gh/read/porcelain";
+import { repoSlug } from "#gh/read/keys";
 
 export type IssueInfo = {
   number: number;
@@ -34,52 +38,6 @@ export type RawIssueComment = {
   html_url: string;
 };
 
-const REST_PAGE_SIZE = 100;
-
-const parseJson = <T>(
-  stdout: string,
-  command: string,
-  parseFailurePrefix: string,
-): Effect.Effect<T, GitHubCommandError> =>
-  Effect.try({
-    try: () => JSON.parse(stdout) as T,
-    catch: (error) =>
-      new GitHubCommandError({
-        command,
-        exitCode: 0,
-        stderr: `${parseFailurePrefix}: ${error instanceof Error ? error.message : String(error)}`,
-        message: `${parseFailurePrefix}: ${error instanceof Error ? error.message : String(error)}`,
-      }),
-  });
-
-const fetchAllRestPages = Effect.fn("issue.fetchAllRestPages")(function* <T>(
-  endpoint: string,
-  command: string,
-  parseFailurePrefix: string,
-) {
-  const service = yield* GitHubService;
-
-  const results: T[] = [];
-  let page = 1;
-
-  while (true) {
-    const separator = endpoint.includes("?") ? "&" : "?";
-    const result = yield* service.runGh([
-      "api",
-      `${endpoint}${separator}per_page=${REST_PAGE_SIZE}&page=${page}`,
-    ]);
-
-    const rawPage = yield* parseJson<T[]>(result.stdout, command, parseFailurePrefix);
-    results.push(...rawPage);
-
-    if (rawPage.length < REST_PAGE_SIZE) {
-      return results;
-    }
-
-    page += 1;
-  }
-});
-
 const mapRawIssueComment = (comment: RawIssueComment): IssueComment => ({
   id: comment.id as IssueCommentId,
   commitSha: null,
@@ -95,35 +53,21 @@ export const listIssues = Effect.fn("issue.listIssues")(function* (opts: {
   labels: string | null;
   limit: number;
 }) {
-  const gh = yield* GitHubService;
-
-  const args = [
-    "issue",
-    "list",
-    "--state",
-    opts.state,
-    "--limit",
-    String(opts.limit),
-    "--json",
-    "number,title,state,url,labels,createdAt",
-  ];
-
-  if (opts.labels !== null) {
-    args.push("--label", opts.labels);
-  }
-
-  return yield* gh.runGhJson<IssueListItem[]>(args);
+  return yield* reads.issueList(yield* resolveRepo(null), opts);
 });
 
 export const viewIssue = Effect.fn("issue.viewIssue")(function* (issueNumber: number) {
-  const gh = yield* GitHubService;
-
-  return yield* gh.runGhJson<IssueInfo>([
-    "issue",
-    "view",
-    String(issueNumber),
-    "--json",
-    "number,title,state,url,labels,assignees,author,createdAt,closedAt",
+  const value = yield* reads.issueView(yield* resolveRepo(null), issueNumber);
+  return project(value, [
+    "number",
+    "title",
+    "state",
+    "url",
+    "labels",
+    "assignees",
+    "author",
+    "createdAt",
+    "closedAt",
   ]);
 });
 
@@ -133,14 +77,7 @@ export const fetchIssueComments = Effect.fn("issue.fetchIssueComments")(function
   author: string | null,
   bodyContains: string | null,
 ) {
-  const gh = yield* GitHubService;
-  const repoInfo = yield* gh.getRepoInfo();
-
-  const raw = yield* fetchAllRestPages<RawIssueComment>(
-    `repos/${repoInfo.owner}/${repoInfo.name}/issues/${issueNumber}/comments`,
-    "gh-tool issue comments",
-    "Failed to parse response",
-  );
+  const raw = yield* reads.issueComments(yield* resolveRepo(null), issueNumber);
 
   let comments = raw.map(mapRawIssueComment);
 
@@ -167,46 +104,40 @@ export const closeIssue = Effect.fn("issue.closeIssue")(function* (opts: {
   comment: string | null;
   reason: string;
 }) {
-  const gh = yield* GitHubService;
-
   const args = ["issue", "close", String(opts.issue), "--reason", opts.reason];
 
   if (opts.comment !== null) {
     args.push("--comment", opts.comment);
   }
 
-  yield* gh.runGh(args);
-
-  return yield* gh.runGhJson<IssueInfo>([
-    "issue",
-    "view",
-    String(opts.issue),
-    "--json",
-    "number,title,state,url,labels,assignees,author,createdAt,closedAt",
+  const repo = yield* resolveRepo(null);
+  yield* writes.run(args, [
+    `issue:${repoSlug(repo)}#${opts.issue}`,
+    `issues:${repoSlug(repo)}`,
+    `issue-comments:${repoSlug(repo)}#${opts.issue}`,
   ]);
+
+  return yield* viewIssue(opts.issue);
 });
 
 export const reopenIssue = Effect.fn("issue.reopenIssue")(function* (opts: {
   issue: number;
   comment: string | null;
 }) {
-  const gh = yield* GitHubService;
-
   const args = ["issue", "reopen", String(opts.issue)];
 
   if (opts.comment !== null) {
     args.push("--comment", opts.comment);
   }
 
-  yield* gh.runGh(args);
-
-  return yield* gh.runGhJson<IssueInfo>([
-    "issue",
-    "view",
-    String(opts.issue),
-    "--json",
-    "number,title,state,url,labels,assignees,author,createdAt,closedAt",
+  const repo = yield* resolveRepo(null);
+  yield* writes.run(args, [
+    `issue:${repoSlug(repo)}#${opts.issue}`,
+    `issues:${repoSlug(repo)}`,
+    `issue-comments:${repoSlug(repo)}#${opts.issue}`,
   ]);
+
+  return yield* viewIssue(opts.issue);
 });
 
 export const commentOnIssue = Effect.fn("issue.commentOnIssue")(function* (opts: {
@@ -227,14 +158,20 @@ export const commentOnIssue = Effect.fn("issue.commentOnIssue")(function* (opts:
     );
   }
 
-  const result = yield* gh.runGh([
-    "api",
-    "-X",
-    "POST",
-    `repos/${repoInfo.owner}/${repoInfo.name}/issues/${opts.issue}/comments`,
-    "-f",
-    `body=${opts.body}`,
-  ]);
+  const result = yield* writes.run(
+    [
+      "api",
+      "-X",
+      "POST",
+      `repos/${repoInfo.owner}/${repoInfo.name}/issues/${opts.issue}/comments`,
+      "-f",
+      `body=${opts.body}`,
+    ],
+    [
+      `issue-comments:${repoInfo.owner.toLowerCase()}/${repoInfo.name.toLowerCase()}#${opts.issue}`,
+      `issue:${repoInfo.owner.toLowerCase()}/${repoInfo.name.toLowerCase()}#${opts.issue}`,
+    ],
+  );
 
   const rawComment = yield* Effect.try({
     try: () => JSON.parse(result.stdout) as RawIssueComment,
@@ -262,8 +199,6 @@ export const createIssue = Effect.fn("issue.createIssue")(function* (opts: {
   assignee: string | null;
   labels: string | null;
 }) {
-  const gh = yield* GitHubService;
-
   const args = ["issue", "create", "--title", opts.title, "--body", opts.body];
 
   if (opts.assignee !== null) {
@@ -273,7 +208,8 @@ export const createIssue = Effect.fn("issue.createIssue")(function* (opts: {
     args.push("--label", opts.labels);
   }
 
-  const result = yield* gh.runGh(args);
+  const repo = yield* resolveRepo(null);
+  const result = yield* writes.run(args, [`repo:${repoSlug(repo)}`]);
 
   const urlMatch = result.stdout.match(/\/issues\/(\d+)/);
   if (!urlMatch?.[1]) {
@@ -299,8 +235,6 @@ export const editIssue = Effect.fn("issue.editIssue")(function* (opts: {
   addAssignee: string | null;
   removeAssignee: string | null;
 }) {
-  const gh = yield* GitHubService;
-
   const args = ["issue", "edit", String(opts.issue)];
 
   if (opts.title !== null) {
@@ -322,13 +256,12 @@ export const editIssue = Effect.fn("issue.editIssue")(function* (opts: {
     args.push("--remove-assignee", opts.removeAssignee);
   }
 
-  yield* gh.runGh(args);
-
-  return yield* gh.runGhJson<IssueInfo>([
-    "issue",
-    "view",
-    String(opts.issue),
-    "--json",
-    "number,title,state,url,labels,assignees,author,createdAt,closedAt",
+  const repo = yield* resolveRepo(null);
+  yield* writes.run(args, [
+    `issue:${repoSlug(repo)}#${opts.issue}`,
+    `issues:${repoSlug(repo)}`,
+    `issue-comments:${repoSlug(repo)}#${opts.issue}`,
   ]);
+
+  return yield* viewIssue(opts.issue);
 });

package/src/gh-tool/issue/triage.ts

@@ -4,10 +4,11 @@ import { Effect, Option, Schema } from "effect";
 import type { CheckResult, IssueComment, PRViewInfo, ReviewThread } from "#gh/types";
 
 import { formatOption, logFormatted } from "#shared";
-import { GitHubService } from "#gh/service";
+import { GitHubService } from "#gh/read/transport";
 import { fetchReviewTriage } from "#gh/pr/commands";
 
 import { fetchIssueComments } from "./core";
+import { reads, resolveRepo } from "#gh/read/reads";
 
 const repoOption = Flag.String("repo").pipe(
   Flag.withDescription("Target repository profile name or owner/name"),
@@ -23,19 +24,6 @@ const withRepo = <A, E, R>(repo: Option.Option<string>, effect: Effect.Effect<A,
 const TriageVerbosity = Schema.Literals(["compact", "full"]);
 type TriageVerbosity = typeof TriageVerbosity.Type;
 
-type RawTriageIssue = {
-  number: number;
-  title: string;
-  state: string;
-  url: string;
-  labels: Array<{ name: string }>;
-  assignees: Array<{ login: string }>;
-  author: { login: string };
-  body: string;
-  createdAt: string;
-  closedAt: string | null;
-};
-
 type TriageIssue = {
   number: number;
   title: string;
@@ -114,19 +102,9 @@ export const fetchIssueTriage = Effect.fn("issue.fetchIssueTriage")(function* (o
   issue: number;
   verbosity: TriageVerbosity;
 }) {
-  const gh = yield* GitHubService;
-
+  const repo = yield* resolveRepo(null);
   const [rawIssue, comments] = yield* Effect.all(
-    [
-      gh.runGhJson<RawTriageIssue>([
-        "issue",
-        "view",
-        String(opts.issue),
-        "--json",
-        "number,title,state,url,labels,assignees,author,body,createdAt,closedAt",
-      ]),
-      fetchIssueComments(opts.issue, null, null, null),
-    ],
+    [reads.issueView(repo, opts.issue), fetchIssueComments(opts.issue, null, null, null)],
     { concurrency: "unbounded" },
   );
 

package/src/gh-tool/main.ts

@@ -72,7 +72,9 @@ import {
   releaseViewCommand,
 } from "./release";
 import { repoInfoCommand, repoListCommand, repoSearchCodeCommand } from "./repo";
-import { GitHubService } from "./service";
+import { GitHubService } from "./read/transport";
+import { withReadCache } from "./read";
+import { cacheCommand } from "./read/commands";
 import {
   workflowAnnotationsCommand,
   workflowCancelCommand,
@@ -240,6 +242,7 @@ WORKFLOW FOR AI AGENTS:
     releaseCommand,
     gistCommand,
     commandsCommand,
+    cacheCommand,
   ]),
 );
 
@@ -254,7 +257,7 @@ const MainLayer = GitHubService.layer.pipe(
   Layer.provideMerge(ConfigServiceLayer),
 );
 
-const program = withRedactedOutput(withAudit("gh", cli)).pipe(
+const program = withReadCache(withRedactedOutput(withAudit("gh", cli))).pipe(
   Effect.provide(MainLayer),
   Effect.tapCause(renderCauseToStderr),
 );

package/src/gh-tool/pr/commands.ts

@@ -1,10 +1,12 @@
+import { reads, writes } from "#gh/read/index";
+import { repoSlug } from "#gh/read/keys";
 import { Command, Flag, Param } from "effect/cli";
 import { Console, Effect, Option } from "effect";
 
 import type { CheckResult, PRStatusResult } from "#gh/types";
 
 import { formatOption, logFormatted, logText } from "#shared";
-import { GitHubService } from "#gh/service";
+import { GitHubService } from "#gh/read/transport";
 import { GitHubCommandError } from "#gh/errors";
 
 const emptyBatchError = (batch: string) =>
@@ -152,20 +154,20 @@ export const requestReview = (pr: number, reviewers: string) =>
     const repo = yield* gh.getRepoInfo();
     // ponytail: not atomic — a concurrent request between GET and POST misreports newlyRequested.
     const pendingBefore = new Set(
-      (yield* confirmedReviewers(
-        yield* gh.runGhJson<RequestedReviewersResponse>([
-          "api",
-          `repos/${repo.owner}/${repo.name}/pulls/${pr}`,
-        ]),
-      )).map((login) => login.toLowerCase()),
+      (yield* confirmedReviewers(yield* reads.reviewGuards.requestedReviewers(repo, pr))).map(
+        (login) => login.toLowerCase(),
+      ),
+    );
+    const response = yield* writes.json<RequestedReviewersResponse>(
+      [
+        "api",
+        "--method",
+        "POST",
+        `repos/${repo.owner}/${repo.name}/pulls/${pr}/requested_reviewers`,
+        ...submittedReviewers.flatMap((reviewer) => ["-f", `reviewers[]=${reviewer}`]),
+      ],
+      [`pr:${repoSlug(repo)}#${pr}`, `reviews:${repoSlug(repo)}#${pr}`, `pulls:${repoSlug(repo)}`],
     );
-    const response = yield* gh.runGhJson<RequestedReviewersResponse>([
-      "api",
-      "--method",
-      "POST",
-      `repos/${repo.owner}/${repo.name}/pulls/${pr}/requested_reviewers`,
-      ...submittedReviewers.flatMap((reviewer) => ["-f", `reviewers[]=${reviewer}`]),
-    ]);
     return {
       pr,
       submittedReviewers,
@@ -239,7 +241,7 @@ const withStableHead = Effect.fn("pr.withStableHead")(function* <A, E, R>(
     initial,
     (info) => collect(info.number, info.headSha),
     (info) =>
-      fetchPRView(info.number).pipe(
+      fetchPRView(info.number, "origin").pipe(
         Effect.map((refreshed) => ({ ...refreshed, baseSha: initial.baseSha })),
       ),
     (before, after) => after.headSha === before.headSha,