@blogic-cz/agent-tools 0.15.13 → 0.16.0

package/src/logs-tool/errors.ts

@@ -1,6 +1,6 @@
 import { Schema } from "effect";
 
-export class LogsNotFoundError extends Schema.TaggedErrorClass<LogsNotFoundError>()(
+export class LogsNotFoundError extends Schema.TaggedError<LogsNotFoundError>()(
   "LogsNotFoundError",
   {
     message: Schema.String,
@@ -11,7 +11,7 @@ export class LogsNotFoundError extends Schema.TaggedErrorClass<LogsNotFoundError
   },
 ) {}
 
-export class LogsReadError extends Schema.TaggedErrorClass<LogsReadError>()("LogsReadError", {
+export class LogsReadError extends Schema.TaggedError<LogsReadError>()("LogsReadError", {
   message: Schema.String,
   source: Schema.String,
   hint: Schema.optionalKey(Schema.String),
@@ -19,23 +19,20 @@ export class LogsReadError extends Schema.TaggedErrorClass<LogsReadError>()("Log
   retryable: Schema.optionalKey(Schema.Boolean),
 }) {}
 
-export class LogsConfigError extends Schema.TaggedErrorClass<LogsConfigError>()("LogsConfigError", {
+export class LogsConfigError extends Schema.TaggedError<LogsConfigError>()("LogsConfigError", {
   message: Schema.String,
   hint: Schema.optionalKey(Schema.String),
   nextCommand: Schema.optionalKey(Schema.String),
   retryable: Schema.optionalKey(Schema.Boolean),
 }) {}
 
-export class LogsTimeoutError extends Schema.TaggedErrorClass<LogsTimeoutError>()(
-  "LogsTimeoutError",
-  {
-    message: Schema.String,
-    source: Schema.String,
-    timeoutMs: Schema.Number,
-    hint: Schema.optionalKey(Schema.String),
-    nextCommand: Schema.optionalKey(Schema.String),
-    retryable: Schema.optionalKey(Schema.Boolean),
-  },
-) {}
+export class LogsTimeoutError extends Schema.TaggedError<LogsTimeoutError>()("LogsTimeoutError", {
+  message: Schema.String,
+  source: Schema.String,
+  timeoutMs: Schema.Number,
+  hint: Schema.optionalKey(Schema.String),
+  nextCommand: Schema.optionalKey(Schema.String),
+  retryable: Schema.optionalKey(Schema.Boolean),
+}) {}
 
 export type LogsError = LogsNotFoundError | LogsReadError | LogsConfigError | LogsTimeoutError;

package/src/observability-tool/errors.ts

@@ -1,6 +1,6 @@
 import { Schema } from "effect";
 
-export class ObservabilityToolError extends Schema.TaggedErrorClass<ObservabilityToolError>()(
+export class ObservabilityToolError extends Schema.TaggedError<ObservabilityToolError>()(
   "ObservabilityToolError",
   {
     cause: Schema.Unknown,

package/src/session-tool/errors.ts

@@ -1,6 +1,6 @@
 import { Schema } from "effect";
 
-export class SessionStorageNotFoundError extends Schema.TaggedErrorClass<SessionStorageNotFoundError>()(
+export class SessionStorageNotFoundError extends Schema.TaggedError<SessionStorageNotFoundError>()(
   "SessionStorageNotFoundError",
   {
     message: Schema.String,
@@ -8,22 +8,19 @@ export class SessionStorageNotFoundError extends Schema.TaggedErrorClass<Session
   },
 ) {}
 
-export class SessionReadError extends Schema.TaggedErrorClass<SessionReadError>()(
-  "SessionReadError",
-  {
-    message: Schema.String,
-    source: Schema.String,
-  },
-) {}
+export class SessionReadError extends Schema.TaggedError<SessionReadError>()("SessionReadError", {
+  message: Schema.String,
+  source: Schema.String,
+}) {}
 
-export class SessionConfigError extends Schema.TaggedErrorClass<SessionConfigError>()(
+export class SessionConfigError extends Schema.TaggedError<SessionConfigError>()(
   "SessionConfigError",
   {
     message: Schema.String,
   },
 ) {}
 
-export class SessionParseError extends Schema.TaggedErrorClass<SessionParseError>()(
+export class SessionParseError extends Schema.TaggedError<SessionParseError>()(
   "SessionParseError",
   {
     message: Schema.String,

package/src/shared/binary-preflight.ts

@@ -0,0 +1,42 @@
+export const REQUIRED_BINARIES = {
+  az: {
+    tools: "az-tool",
+    install:
+      "Install it with `brew install azure-cli` (macOS) or see https://learn.microsoft.com/cli/azure/install-azure-cli.",
+  },
+  gh: {
+    tools: "gh-tool",
+    install:
+      "Install it with `brew install gh` (macOS) or see https://cli.github.com/, then run `gh auth login`.",
+  },
+  git: {
+    tools: "gh-tool release and stack commands",
+    install:
+      "Install it with `xcode-select --install` (macOS) or see https://git-scm.com/downloads.",
+  },
+  kubectl: {
+    tools: "k8s-tool and db-tool tunnels",
+    install:
+      "Install it with `brew install kubectl` (macOS) or see https://kubernetes.io/docs/tasks/tools/.",
+  },
+} as const;
+
+export type RequiredBinary = keyof typeof REQUIRED_BINARIES;
+
+export type MissingBinary = { binary: RequiredBinary; message: string; hint: string };
+
+const isRequiredBinary = (binary: string): binary is RequiredBinary => binary in REQUIRED_BINARIES;
+
+export const describeMissingBinary = (binary: RequiredBinary): MissingBinary => ({
+  binary,
+  message: `Required binary "${binary}" was not found on PATH.`,
+  hint: `${binary} is needed by ${REQUIRED_BINARIES[binary].tools}. ${REQUIRED_BINARIES[binary].install}`,
+});
+
+export const missingBinaryFromSpawnFailure = (
+  binary: string,
+  failure: string,
+): MissingBinary | undefined =>
+  isRequiredBinary(binary) && failure.includes("NotFound")
+    ? describeMissingBinary(binary)
+    : undefined;

package/src/shared/env-template.ts

@@ -2,7 +2,7 @@ import { Effect, Schema } from "effect";
 
 const envTemplateRegex = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
 
-export class EnvTemplateError extends Schema.TaggedErrorClass<EnvTemplateError>()(
+export class EnvTemplateError extends Schema.TaggedError<EnvTemplateError>()(
   "@agent-tools/EnvTemplateError",
   { envVar: Schema.String },
 ) {}

package/src/shared/exec.ts

@@ -3,7 +3,7 @@ import { Effect, Schema, Stream } from "effect";
 
 const DEFAULT_TIMEOUT_MS = 30000;
 
-export class ExecError extends Schema.TaggedErrorClass<ExecError>()("ExecError", {
+export class ExecError extends Schema.TaggedError<ExecError>()("ExecError", {
   message: Schema.String,
   command: Schema.String,
   exitCode: Schema.Number,

package/src/shared/index.ts

@@ -1,4 +1,11 @@
-export type { BaseResult, CommandOptions, CommandResult, Environment, OutputFormat } from "./types";
+export type {
+  BaseResult,
+  CommandOptions,
+  CommandResult,
+  Environment,
+  OutputFormat,
+  ToolResult,
+} from "./types";
 
 export { formatAny, formatOption, formatOutput, logFormatted } from "./format";
 

package/src/shared/prerequisites/errors.ts

@@ -1,6 +1,6 @@
 import { Schema } from "effect";
 
-export class PrerequisiteRunError extends Schema.TaggedErrorClass<PrerequisiteRunError>()(
+export class PrerequisiteRunError extends Schema.TaggedError<PrerequisiteRunError>()(
   "PrerequisiteRunError",
   {
     message: Schema.String,

package/src/shared/prerequisites/index.ts

@@ -0,0 +1,12 @@
+export { runWithProfilePrerequisites } from "#shared/prerequisites/runtime";
+
+export { resolveEnvironmentScopedPrerequisites } from "#shared/prerequisites/config";
+
+export { isPrerequisiteRunError, PrerequisiteRunError } from "#shared/prerequisites/errors";
+
+export type {
+  PrerequisiteCommandResult,
+  PrerequisiteCommandRunner,
+} from "#shared/prerequisites/types";
+
+export type { ProfilePrerequisites, VpnPrerequisite } from "#config/types";

package/src/shared/throttle.ts

@@ -2,7 +2,7 @@ import { Effect, Ref, Schema } from "effect";
 
 const WINDOW_MS = 60000;
 
-export class ThrottleError extends Schema.TaggedErrorClass<ThrottleError>()("ThrottleError", {
+export class ThrottleError extends Schema.TaggedError<ThrottleError>()("ThrottleError", {
   message: Schema.String,
   label: Schema.String,
   limit: Schema.Number,

package/src/shared/types.ts

@@ -10,6 +10,12 @@ export type BaseResult = {
   hint?: string;
 };
 
+// Widening BaseResult itself is not honest: db-tool's select branch emits no message.
+export type ToolResult = BaseResult & {
+  message: string;
+  data?: unknown;
+};
+
 export type CommandOptions = {
   cwd?: string;
   env?: Record<string, string>;

package/src/db-tool/psql.ts

@@ -1,27 +0,0 @@
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-
-// Homebrew keeps libpq keg-only, so psql is routinely installed yet absent from PATH.
-const KEG_ONLY_PSQL_DIRECTORIES = ["/opt/homebrew/opt/libpq/bin", "/usr/local/opt/libpq/bin"];
-
-export const PSQL_MISSING_HINT =
-  "psql was not found on PATH. On macOS install it with `brew install libpq`; libpq is keg-only, so also add /opt/homebrew/opt/libpq/bin (Apple silicon) or /usr/local/opt/libpq/bin (Intel) to PATH.";
-
-export const resolvePsqlSearchPath = (
-  pathEnv: string | undefined,
-  fileExists: (candidate: string) => boolean = existsSync,
-): string | undefined => {
-  const directories = (pathEnv ?? "").split(":").filter((directory) => directory.length > 0);
-  if (directories.some((directory) => fileExists(join(directory, "psql")))) {
-    return pathEnv;
-  }
-
-  const kegOnly = KEG_ONLY_PSQL_DIRECTORIES.find((directory) =>
-    fileExists(join(directory, "psql")),
-  );
-  if (kegOnly === undefined) {
-    return pathEnv;
-  }
-
-  return directories.length > 0 ? [...directories, kegOnly].join(":") : kegOnly;
-};