@blogic-cz/agent-tools 0.8.16 → 0.8.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blogic-cz/agent-tools",
-  "version": "0.8.16",
+  "version": "0.8.18",
   "description": "CLI tools for AI coding agent workflows — GitHub, database, Kubernetes, Azure DevOps, logs, sessions, and audit",
   "keywords": [
     "agent",
@@ -116,22 +116,26 @@
     "lint": "oxlint -c ./.oxlintrc.json --deny-warnings",
     "lint:fix": "oxlint -c ./.oxlintrc.json --fix",
     "session-tool": "bun src/session-tool/index.ts",
+    "update:packages": "bun update -i -r",
     "update:skills": "bun run .agents/skills/update-packages/references/skills-update-local.ts",
     "test": "vitest run"
   },
   "dependencies": {
-    "@effect/platform-bun": "4.0.0-beta.25",
+    "@effect/platform-bun": "4.0.0-beta.48",
     "@toon-format/toon": "2.1.0",
-    "effect": "4.0.0-beta.25"
+    "effect": "4.0.0-beta.48"
   },
   "devDependencies": {
-    "@effect/language-service": "0.77.0",
-    "@effect/vitest": "4.0.0-beta.25",
-    "@types/bun": "1.3.9",
-    "oxfmt": "0.35.0",
-    "oxlint": "1.50.0",
-    "typescript": "5.9.3",
-    "vitest": "^4.0.18"
+    "@effect/language-service": "0.85.1",
+    "@effect/vitest": "4.0.0-beta.48",
+    "@types/bun": "1.3.12",
+    "oxfmt": "0.44.0",
+    "oxlint": "1.59.0",
+    "typescript": "6.0.2",
+    "vitest": "^4.1.4"
+  },
+  "overrides": {
+    "@effect/platform-node-shared": "4.0.0-beta.48"
   },
   "engines": {
     "bun": ">=1.0.0"

package/src/az-tool/service.ts

@@ -1,5 +1,5 @@
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-import { Effect, Layer, ServiceMap, Stream, Option } from "effect";
+import { Context, Effect, Layer, Option, Stream } from "effect";
 
 import type { InvokeParams } from "./types";
 import type { AzureConfig } from "#config/types";
@@ -10,7 +10,7 @@ import { isCommandAllowed, isInvokeAllowed } from "./security";
 import { transformCmdOutput } from "./transformers";
 import { ConfigService, getToolConfig } from "#config";
 
-export class AzService extends ServiceMap.Service<
+export class AzService extends Context.Service<
   AzService,
   {
     readonly runCommand: (

package/src/config/loader.ts

@@ -1,6 +1,6 @@
 import { dirname } from "node:path";
 
-import { Data, Effect, Layer, Schema, ServiceMap } from "effect";
+import { Context, Data, Effect, Layer, Schema } from "effect";
 
 import type { AgentToolsConfig, GitHubRepoConfig } from "./types";
 
@@ -159,10 +159,9 @@ export async function loadConfig(): Promise<AgentToolsConfig | undefined> {
   return decodeConfig(parsed, configPath);
 }
 
-export class ConfigService extends ServiceMap.Service<
-  ConfigService,
-  AgentToolsConfig | undefined
->()("@agent-tools/ConfigService") {}
+export class ConfigService extends Context.Service<ConfigService, AgentToolsConfig | undefined>()(
+  "@agent-tools/ConfigService",
+) {}
 
 export class ConfigLoadError extends Data.TaggedError("ConfigLoadError")<{
   readonly cause: unknown;

package/src/db-tool/config-service.ts

@@ -1,4 +1,4 @@
-import { Effect, Layer, ServiceMap } from "effect";
+import { Context, Effect, Layer } from "effect";
 
 import { ConfigService, getToolConfig } from "#config";
 import type { DatabaseConfig } from "#config";
@@ -12,10 +12,9 @@ import type { DatabaseConfig } from "#config";
  *   const dbConfig = yield* DbConfigService;
  *   if (!dbConfig) { // no config }
  */
-export class DbConfigService extends ServiceMap.Service<
-  DbConfigService,
-  DatabaseConfig | undefined
->()("@agent-tools/DbConfigService") {}
+export class DbConfigService extends Context.Service<DbConfigService, DatabaseConfig | undefined>()(
+  "@agent-tools/DbConfigService",
+) {}
 
 /**
  * Creates a DbConfigService layer that resolves the database config

package/src/db-tool/service.ts

@@ -1,5 +1,5 @@
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-import { Clock, Duration, Effect, Layer, Ref, ServiceMap, Stream } from "effect";
+import { Clock, Context, Duration, Effect, Layer, Ref, Stream } from "effect";
 
 import type { DbConfig, QueryResult, SchemaMode } from "./types";
 
@@ -33,7 +33,7 @@ export function resolveDbAccessMode(
   };
 }
 
-export class DbService extends ServiceMap.Service<
+export class DbService extends Context.Service<
   DbService,
   {
     readonly executeQuery: (env: string, sql: string) => Effect.Effect<QueryResult, DbError>;

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

@@ -1,4 +1,4 @@
-import { Console, Effect, Option } from "effect";
+import { Console, Effect, Option, Result } from "effect";
 
 import type {
   BranchPRDetail,
@@ -20,6 +20,16 @@ import { runLocalCommand } from "./helpers";
 const CHECK_JSON_FIELDS = "name,state,bucket,link";
 const GITHUB_ACTIONS_RUN_ID_RE = /github\.com\/[^/]+\/[^/]+\/actions\/runs\/(\d+)/;
 
+type WorkflowRunJobsForRerun = {
+  databaseId: number;
+  jobs: Array<{
+    databaseId: number;
+    name: string;
+    status: string;
+    conclusion: string | null;
+  }>;
+};
+
 const buildChecksCommand = (pr: number | null, includeWatch: boolean): string =>
   `bun agent-tools-gh pr checks${pr !== null ? ` --pr ${pr}` : ""}${includeWatch ? " --watch" : ""}`;
 
@@ -36,6 +46,47 @@ const extractRunIdFromCheckLink = (link: string): number | null => {
   return Number.isFinite(runId) ? runId : null;
 };
 
+const isFailedWorkflowJob = (job: { status: string; conclusion: string | null }) =>
+  job.conclusion === "failure" || job.status === "failure";
+
+const getCheckJobNameCandidates = (checkName: string): string[] => {
+  const exact = checkName.trim();
+  const suffixParts = exact.split("/").map((part) => part.trim());
+  let suffix: string | undefined;
+  for (let index = suffixParts.length - 1; index >= 0; index -= 1) {
+    const part = suffixParts[index];
+    if (part !== undefined && part.length > 0) {
+      suffix = part;
+      break;
+    }
+  }
+
+  return [...new Set([exact, suffix].filter((value): value is string => value !== undefined))];
+};
+
+const resolveJobIdsForFailedChecks = (
+  checks: CheckResult[],
+  jobs: WorkflowRunJobsForRerun["jobs"],
+): number[] | null => {
+  const failedJobs = jobs.filter(isFailedWorkflowJob);
+  const jobIds = new Set<number>();
+
+  for (const check of checks) {
+    const candidates = getCheckJobNameCandidates(check.name);
+    const matches = failedJobs.filter((job) =>
+      candidates.some((candidate) => job.name.toLowerCase() === candidate.toLowerCase()),
+    );
+
+    if (matches.length !== 1) {
+      return null;
+    }
+
+    jobIds.add(matches[0].databaseId);
+  }
+
+  return [...jobIds];
+};
+
 const fetchWorkflowRunFailureContext = Effect.fn("pr.fetchWorkflowRunFailureContext")(function* (
   runId: number,
 ) {
@@ -610,7 +661,7 @@ export const fetchChecks = Effect.fn("pr.fetchChecks")(function* (
     yield* gh.runGh(watchArgs).pipe(
       Effect.timeoutOrElse({
         duration: timeoutMs,
-        onTimeout: () =>
+        orElse: () =>
           Effect.fail(
             new GitHubTimeoutError({
               message: `CI check monitoring timed out after ${timeoutSeconds}s`,
@@ -652,13 +703,18 @@ export const fetchChecksForCommand = Effect.fn("pr.fetchChecksForCommand")(funct
   }
 
   const watchedChecks = yield* fetchChecks(pr, true, failFast, timeoutSeconds).pipe(
-    Effect.catchTag("GitHubCommandError", (error) =>
-      Effect.succeed({ _tag: "command_error" as const, error }),
-    ),
+    Effect.result,
+    Effect.flatMap((result) => {
+      if (Result.isFailure(result) && result.failure._tag !== "GitHubCommandError") {
+        return Effect.fail(result.failure);
+      }
+
+      return Effect.succeed(result);
+    }),
   );
 
-  if (Array.isArray(watchedChecks)) {
-    return watchedChecks;
+  if (Result.isSuccess(watchedChecks)) {
+    return watchedChecks.success;
   }
 
   const finalChecks = yield* fetchCheckResults(pr);
@@ -666,7 +722,7 @@ export const fetchChecksForCommand = Effect.fn("pr.fetchChecksForCommand")(funct
     return yield* buildFailedChecksReport(pr, finalChecks);
   }
 
-  return yield* Effect.fail(watchedChecks.error);
+  return yield* Effect.fail(watchedChecks.failure);
 });
 
 export const rerunChecks = Effect.fn("pr.rerunChecks")(function* (
@@ -675,21 +731,20 @@ export const rerunChecks = Effect.fn("pr.rerunChecks")(function* (
 ) {
   const gh = yield* GitHubService;
 
-  const checks = yield* gh.runGhJson<
-    Array<{
-      name: string;
-      link: string;
-      bucket: string;
-      state: string;
-    }>
-  >(["pr", "checks", ...(pr !== null ? [String(pr)] : []), "--json", "name,link,bucket,state"]);
+  const checks = yield* fetchCheckResults(pr);
+
+  const targetChecks = failedOnly ? checks.filter((check) => check.bucket === "fail") : checks;
 
   // Extract unique GitHub Actions run IDs from links
   const runIds = new Set<string>();
-  for (const check of failedOnly ? checks.filter((c) => c.bucket === "fail") : checks) {
-    const match = check.link.match(/github\.com\/[^/]+\/[^/]+\/actions\/runs\/(\d+)/);
+  const checksByRun = new Map<string, CheckResult[]>();
+  for (const check of targetChecks) {
+    const match = check.link.match(GITHUB_ACTIONS_RUN_ID_RE);
     if (match?.[1]) {
       runIds.add(match[1]);
+      const existing = checksByRun.get(match[1]) ?? [];
+      existing.push(check);
+      checksByRun.set(match[1], existing);
     }
   }
 
@@ -707,11 +762,40 @@ export const rerunChecks = Effect.fn("pr.rerunChecks")(function* (
     success: boolean;
   }> = [];
   for (const runId of runIds) {
-    const rerunArgs = failedOnly ? ["run", "rerun", runId, "--failed"] : ["run", "rerun", runId];
-    const success = yield* gh.runGh(rerunArgs).pipe(
-      Effect.map(() => true),
-      Effect.catch(() => Effect.succeed(false)),
-    );
+    const success = yield* Effect.gen(function* () {
+      if (!failedOnly) {
+        return yield* gh.runGh(["run", "rerun", runId]).pipe(
+          Effect.map(() => true),
+          Effect.catch(() => Effect.succeed(false)),
+        );
+      }
+
+      const checksForRun = checksByRun.get(runId) ?? [];
+      const run = yield* gh
+        .runGhJson<WorkflowRunJobsForRerun>(["run", "view", runId, "--json", "databaseId,jobs"])
+        .pipe(Effect.catchTag("GitHubCommandError", () => Effect.succeed(null)));
+
+      const jobIds = run === null ? null : resolveJobIdsForFailedChecks(checksForRun, run.jobs);
+      if (jobIds === null || jobIds.length === 0) {
+        return yield* gh.runGh(["run", "rerun", runId, "--failed"]).pipe(
+          Effect.map(() => true),
+          Effect.catch(() => Effect.succeed(false)),
+        );
+      }
+
+      const rerunResults = yield* Effect.forEach(
+        jobIds,
+        (jobId) =>
+          gh.runGh(["run", "rerun", "--job", String(jobId)]).pipe(
+            Effect.map(() => true),
+            Effect.catch(() => Effect.succeed(false)),
+          ),
+        { concurrency: 1 },
+      );
+
+      return rerunResults.every(Boolean);
+    });
+
     results.push({ runId, success });
   }
 

package/src/gh-tool/service.ts

@@ -1,5 +1,5 @@
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-import { Effect, Layer, ServiceMap, Stream } from "effect";
+import { Context, Effect, Layer, Stream } from "effect";
 
 import type { RepoInfo } from "./types";
 
@@ -15,7 +15,7 @@ type GhResult = {
 
 type GhError = GitHubCommandError | GitHubAuthError | GitHubNotFoundError;
 
-export class GitHubService extends ServiceMap.Service<
+export class GitHubService extends Context.Service<
   GitHubService,
   {
     readonly runGh: (args: string[]) => Effect.Effect<GhResult, GhError>;

package/src/k8s-tool/service.ts

@@ -1,5 +1,5 @@
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-import { Effect, Layer, Option, Ref, ServiceMap, Stream } from "effect";
+import { Context, Effect, Layer, Option, Ref, Stream } from "effect";
 
 import type { CommandResult, Environment } from "./types";
 
@@ -13,7 +13,7 @@ import { ConfigService, getToolConfig } from "#config";
 import type { K8sConfig } from "#config";
 import { isKubectlCommandAllowed } from "./security";
 
-export class K8sService extends ServiceMap.Service<
+export class K8sService extends Context.Service<
   K8sService,
   {
     readonly runCommand: (

package/src/logs-tool/service.ts

@@ -1,5 +1,5 @@
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-import { Effect, Layer, Result, ServiceMap, Stream } from "effect";
+import { Context, Effect, Layer, Result, Stream } from "effect";
 
 import type { Environment, LogFile, ReadOptions } from "./types";
 
@@ -47,7 +47,7 @@ export const sanitizeShellArg = (input: string): string => `'${input.replace(/'/
 
 const readCommandOutput = (output: unknown): string => (typeof output === "string" ? output : "");
 
-export class LogsService extends ServiceMap.Service<
+export class LogsService extends Context.Service<
   LogsService,
   {
     readonly listLogs: (env: Environment, profile?: string) => Effect.Effect<LogFile[], LogsError>;

package/src/session-tool/config.ts

@@ -1,4 +1,4 @@
-import { Effect, Layer, ServiceMap } from "effect";
+import { Context, Effect, Layer } from "effect";
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -38,7 +38,7 @@ export const resolveSessionsPath = Effect.gen(function* () {
 /**
  * Context tag for resolved paths (cached during effect execution).
  */
-export class ResolvedPaths extends ServiceMap.Service<
+export class ResolvedPaths extends Context.Service<
   ResolvedPaths,
   {
     readonly messagesPath: string;

package/src/session-tool/service.ts

@@ -1,4 +1,4 @@
-import { Effect, Layer, ServiceMap } from "effect";
+import { Context, Effect, Layer } from "effect";
 import { readdir } from "node:fs/promises";
 
 import type { MessageSummary, SessionInfo } from "./types";
@@ -142,7 +142,7 @@ const readJsonFilesFlat = (dir: string): Effect.Effect<FileEntry[], SessionError
       }),
   });
 
-export class SessionService extends ServiceMap.Service<
+export class SessionService extends Context.Service<
   SessionService,
   {
     readonly getSessionsForProject: (

package/src/shared/audit.ts

@@ -3,7 +3,7 @@ import { mkdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, join } from "node:path";
 
-import { Cause, Effect, Layer, ServiceMap } from "effect";
+import { Cause, Context, Effect, Layer } from "effect";
 
 import { loadConfig } from "#config";
 
@@ -65,7 +65,7 @@ type TableInfoRow = {
   name: string;
 };
 
-export class AuditService extends ServiceMap.Service<AuditService, AuditServiceShape>()(
+export class AuditService extends Context.Service<AuditService, AuditServiceShape>()(
   "@agent-tools/AuditService",
 ) {}