@blogic-cz/agent-tools 0.14.42 → 0.14.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blogic-cz/agent-tools",
-  "version": "0.14.42",
+  "version": "0.14.44",
   "description": "CLI tools for AI coding agent workflows — GitHub, database, Kubernetes, Azure DevOps, logs, sessions, and audit",
   "keywords": [
     "agent",
@@ -137,13 +137,13 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@effect/platform-bun": "4.0.0-beta.74",
+    "@effect/platform-bun": "4.0.0-beta.90",
     "@toon-format/toon": "2.1.0",
-    "effect": "4.0.0-beta.74"
+    "effect": "4.0.0-beta.90"
   },
   "devDependencies": {
     "@effect/language-service": "0.86.2",
-    "@effect/vitest": "4.0.0-beta.74",
+    "@effect/vitest": "4.0.0-beta.90",
     "@types/bun": "1.3.12",
     "oxfmt": "0.44.0",
     "oxlint": "1.59.0",
@@ -151,7 +151,7 @@
     "vitest": "^4.1.4"
   },
   "overrides": {
-    "@effect/platform-node-shared": "4.0.0-beta.74"
+    "@effect/platform-node-shared": "4.0.0-beta.90"
   },
   "engines": {
     "bun": ">=1.0.0"

package/src/audit-tool/index.ts

@@ -3,7 +3,13 @@ import { Command, Flag } from "effect/unstable/cli";
 import { BunRuntime, BunServices } from "@effect/platform-bun";
 import { Console, Effect, Layer, Option } from "effect";
 
-import { formatOption, formatOutput, renderCauseToStderr, VERSION } from "#shared";
+import {
+  makeSchemaCommand,
+  formatOption,
+  formatOutput,
+  renderCauseToStderr,
+  VERSION,
+} from "#shared";
 import { AuditService, AuditServiceLayer, withAudit } from "#shared/audit";
 
 type AuditToolResult<T> = {
@@ -81,9 +87,11 @@ const purgeCommand = Command.make(
     }),
 ).pipe(Command.withDescription("Delete old audit log entries"));
 
+const commandsCommand = makeSchemaCommand(() => mainCommand);
+
 const mainCommand = Command.make("audit-tool", {}).pipe(
   Command.withDescription("Audit log inspection and maintenance for agent-tools"),
-  Command.withSubcommands([listCommand, purgeCommand]),
+  Command.withSubcommands([listCommand, purgeCommand, commandsCommand]),
 );
 
 const cli = Command.run(mainCommand, {

package/src/az-tool/index.ts

@@ -3,7 +3,14 @@ import { Command, Flag } from "effect/unstable/cli";
 import { BunRuntime, BunServices } from "@effect/platform-bun";
 import { Console, Effect, Layer, Option } from "effect";
 
-import { formatAny, formatOption, formatOutput, renderCauseToStderr, VERSION } from "#shared";
+import {
+  makeSchemaCommand,
+  formatAny,
+  formatOption,
+  formatOutput,
+  renderCauseToStderr,
+  VERSION,
+} from "#shared";
 import { AuditServiceLayer, withAudit } from "#shared/audit";
 import {
   findFailedJobs,
@@ -173,6 +180,8 @@ EXAMPLES:
 // Main command with subcommands
 // ---------------------------------------------------------------------------
 
+const commandsCommand = makeSchemaCommand(() => mainCommand);
+
 const mainCommand = Command.make("az-tool", {}).pipe(
   Command.withDescription(
     `Azure CLI Tool for Coding Agents (READ-ONLY)
@@ -187,7 +196,7 @@ Typed build subcommands:
 Raw az wrapper:
   az-tool cmd --cmd "pipelines list"`,
   ),
-  Command.withSubcommands([buildCommand, cmdCommand]),
+  Command.withSubcommands([buildCommand, cmdCommand, commandsCommand]),
 );
 
 const cli = Command.run(mainCommand, {

package/src/db-tool/index.ts

@@ -5,7 +5,13 @@ import { Console, Effect, Layer, Option } from "effect";
 
 import type { SchemaMode } from "./types";
 
-import { formatOption, formatOutput, renderCauseToStderr, VERSION } from "#shared";
+import {
+  makeSchemaCommand,
+  formatOption,
+  formatOutput,
+  renderCauseToStderr,
+  VERSION,
+} from "#shared";
 import { AuditServiceLayer, withAudit } from "#shared/audit";
 import { ConfigService, ConfigServiceLayer, getDefaultEnvironment } from "#config";
 import { DbConfigService, makeDbConfigLayer } from "./config-service";
@@ -133,9 +139,11 @@ const envsCommand = Command.make(
   Command.withDescription("List configured database environments and the default (no network)"),
 );
 
+const commandsCommand = makeSchemaCommand(() => mainCommand);
+
 const mainCommand = Command.make("db-tool", {}).pipe(
   Command.withDescription("Database Query Tool for Coding Agents"),
-  Command.withSubcommands([sqlCommand, schemaCommand, envsCommand]),
+  Command.withSubcommands([sqlCommand, schemaCommand, envsCommand, commandsCommand]),
 );
 
 const cli = Command.run(mainCommand, {
@@ -145,7 +153,9 @@ const cli = Command.run(mainCommand, {
 const dbConfigLayer = makeDbConfigLayer(profileArg);
 
 const MainLayer = DbService.layer.pipe(
-  Layer.provide(dbConfigLayer),
+  // provideMerge (not provide) so DbConfigService stays in the program context for the `envs` command,
+  // which reads it directly rather than going through DbService.
+  Layer.provideMerge(dbConfigLayer),
   Layer.provideMerge(ConfigServiceLayer),
   Layer.provideMerge(BunServices.layer),
   Layer.provideMerge(AuditServiceLayer),

package/src/db-tool/service.ts

@@ -9,7 +9,7 @@ import { resolveEnvTemplate } from "#shared/env-template";
 import { resolveEnvironmentScopedPrerequisites } from "#shared/prerequisites/config";
 import { runWithProfilePrerequisites } from "#shared/prerequisites/runtime";
 import { buildApiProbeArgs } from "#shared/k8s-probe";
-import { DbConfigService, DbConfigServiceLayer, TUNNEL_CHECK_INTERVAL_MS } from "./config-service";
+import { DbConfigService, TUNNEL_CHECK_INTERVAL_MS } from "./config-service";
 import {
   DbConnectionError,
   DbMutationBlockedError,
@@ -829,5 +829,3 @@ export class DbService extends Context.Service<
     ),
   );
 }
-
-export const DbServiceLayer = DbService.layer.pipe(Layer.provide(DbConfigServiceLayer));

package/src/gh-tool/index.ts

@@ -3,7 +3,7 @@ import { Command } from "effect/unstable/cli";
 import { BunRuntime, BunServices } from "@effect/platform-bun";
 import { Effect, Layer } from "effect";
 
-import { renderCauseToStderr, VERSION } from "#shared";
+import { makeSchemaCommand, renderCauseToStderr, VERSION } from "#shared";
 import { AuditServiceLayer, withAudit } from "#shared/audit";
 import { ConfigServiceLayer } from "#config";
 import {
@@ -150,6 +150,8 @@ const releaseCommand = Command.make("release", {}).pipe(
   ]),
 );
 
+const commandsCommand = makeSchemaCommand(() => mainCommand);
+
 const mainCommand = Command.make("gh-tool", {}).pipe(
   Command.withDescription(
     `GitHub CLI Tool for Coding Agents
@@ -188,6 +190,7 @@ WORKFLOW FOR AI AGENTS:
     branchCommand,
     workflowCommand,
     releaseCommand,
+    commandsCommand,
   ]),
 );
 

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

@@ -452,7 +452,11 @@ export const prChecksCommand = Command.make(
     repo: repoOption,
     timeout: Flag.integer("timeout").pipe(
       Flag.withDefault(CI_CHECK_WATCH_TIMEOUT_MS / 1000),
-      Flag.withDescription("Timeout in seconds for watch mode (default: 600)"),
+      Flag.withDescription("Timeout in seconds for watch mode (default: 600, minimum 1)"),
+      Flag.filter(
+        (n) => n >= 1,
+        () => "--timeout must be at least 1 second",
+      ),
     ),
     watch: Flag.boolean("watch").pipe(
       Flag.withDefault(false),
@@ -876,8 +880,10 @@ export const prReviewTriageBatchCommand = Command.make(
     withRepo(
       repo,
       Effect.gen(function* () {
+        const numbers = parsePrNumbers(prs);
+        if (numbers.length === 0) return yield* emptyBatchError(prs);
         const results = yield* Effect.all(
-          parsePrNumbers(prs).map((prNumber) => fetchReviewTriage(prNumber)),
+          numbers.map((prNumber) => fetchReviewTriage(prNumber)),
           { concurrency: "unbounded" },
         );
         yield* logFormatted(results, format);

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

@@ -20,9 +20,6 @@ import { runLocalCommand } from "./helpers";
 
 const CHECK_JSON_FIELDS = "name,state,bucket,link";
 const GITHUB_ACTIONS_RUN_ID_RE = /github\.com\/[^/]+\/[^/]+\/actions\/runs\/(\d+)/;
-// A single blocking `--watch` is capped here so an agent never loses a whole turn to a 30-min
-// foreground wait. On hitting the cap we return the partial snapshot, not a failure (H1).
-const MAX_WATCH_SECONDS = 120;
 
 const validatePRTitle = Effect.fn("pr.validatePRTitle")(function* (title: string) {
   const gh = yield* GitHubService;
@@ -874,11 +871,12 @@ export const fetchChecks = Effect.fn("pr.fetchChecks")(function* (
       watchArgs.push("--fail-fast");
     }
 
-    // Cap the blocking wait; on timeout fall through to a snapshot instead of failing with no state.
-    const cappedSeconds = Math.min(timeoutSeconds, MAX_WATCH_SECONDS);
+    // Block for the caller's requested --timeout (no artificial cap — blocking isn't the problem;
+    // --timeout is validated >= 1s at the CLI boundary). On timeout return a snapshot, never
+    // nothing — that was the actual token-wasting bug.
     const watchOutcome = yield* gh.runGh(watchArgs).pipe(
       Effect.timeoutOrElse({
-        duration: cappedSeconds * 1000,
+        duration: timeoutSeconds * 1000,
         orElse: () => Effect.succeed(null),
       }),
     );
@@ -887,7 +885,7 @@ export const fetchChecks = Effect.fn("pr.fetchChecks")(function* (
     if (watchOutcome === null && results.some((c) => c.bucket === "pending")) {
       const pending = results.filter((c) => c.bucket === "pending").length;
       yield* Console.warn(
-        `ℹ️  Watch capped at ${cappedSeconds}s; ${pending} check(s) still pending (snapshot returned). ` +
+        `ℹ️  Watch timed out after ${timeoutSeconds}s; ${pending} check(s) still pending (snapshot returned). ` +
           `Re-run to keep watching:\n   ${buildChecksCommand(pr, true)}`,
       );
     }

package/src/gh-tool/workflow.ts

@@ -2,6 +2,7 @@ import { Command, Flag } from "effect/unstable/cli";
 import { Console, Effect, Option } from "effect";
 
 import { formatOption, logFormatted } from "#shared";
+import { CI_CHECK_WATCH_TIMEOUT_MS } from "#gh/config";
 import { GitHubCommandError, GitHubNotFoundError } from "./errors";
 import { GitHubService } from "./service";
 import type { CheckRunAnnotation, JobAnnotations } from "./types";
@@ -212,11 +213,15 @@ const cancelRun = Effect.fn("workflow.cancelRun")(function* (runId: number, repo
   };
 });
 
-// `gh run watch` has no native timeout and was observed hanging a turn for 36 min. Cap it and
-// fall back to a one-shot snapshot, mirroring the `pr checks --watch` cap (M1).
-const WATCH_RUN_TIMEOUT_SECONDS = 120;
+// `gh run watch` has no native timeout (observed hanging 36 min). Block for the caller's --timeout,
+// then fall back to a one-shot snapshot so a timeout never returns nothing.
+const DEFAULT_WATCH_RUN_TIMEOUT_SECONDS = CI_CHECK_WATCH_TIMEOUT_MS / 1000;
 
-const watchRun = Effect.fn("workflow.watchRun")(function* (runId: number, repo: string | null) {
+const watchRun = Effect.fn("workflow.watchRun")(function* (
+  runId: number,
+  repo: string | null,
+  timeoutSeconds: number,
+) {
   const gh = yield* GitHubService;
 
   const watchArgs = ["run", "watch", String(runId), "--exit-status"];
@@ -237,7 +242,7 @@ const watchRun = Effect.fn("workflow.watchRun")(function* (runId: number, repo:
       return Effect.fail(error);
     }),
     Effect.timeoutOrElse({
-      duration: WATCH_RUN_TIMEOUT_SECONDS * 1000,
+      duration: timeoutSeconds * 1000,
       orElse: () => Effect.succeed(null),
     }),
   );
@@ -255,7 +260,7 @@ const watchRun = Effect.fn("workflow.watchRun")(function* (runId: number, repo:
     })),
     watchOutput:
       result === null
-        ? `(watch capped at ${WATCH_RUN_TIMEOUT_SECONDS}s; status taken from snapshot — re-run to keep watching)`
+        ? `(watch timed out after ${timeoutSeconds}s; status taken from snapshot — re-run to keep watching)`
         : result.stdout,
   };
 });
@@ -650,11 +655,21 @@ export const workflowWatchCommand = Command.make(
     format: formatOption,
     repo: repoOption,
     run: Flag.integer("run").pipe(Flag.withDescription("Workflow run ID to watch")),
+    timeout: Flag.integer("timeout").pipe(
+      Flag.withDescription(
+        `Max seconds to block before returning a snapshot (default: ${DEFAULT_WATCH_RUN_TIMEOUT_SECONDS}, minimum 1)`,
+      ),
+      Flag.withDefault(DEFAULT_WATCH_RUN_TIMEOUT_SECONDS),
+      Flag.filter(
+        (n) => n >= 1,
+        () => "--timeout must be at least 1 second",
+      ),
+    ),
   },
-  ({ format, repo, run }) =>
+  ({ format, repo, run, timeout }) =>
     Effect.gen(function* () {
       const resolvedRepo = yield* resolveRepoArg(repo);
-      const result = yield* watchRun(run, resolvedRepo);
+      const result = yield* watchRun(run, resolvedRepo, timeout);
       yield* logFormatted(result, format);
     }),
 ).pipe(Command.withDescription("Watch a workflow run until it completes, then show final status"));

package/src/k8s-tool/index.ts

@@ -5,7 +5,13 @@ import { Console, Effect, Layer, Option } from "effect";
 
 import type { CommandResult } from "./types";
 
-import { formatOption, formatOutput, renderCauseToStderr, VERSION } from "#shared";
+import {
+  makeSchemaCommand,
+  formatOption,
+  formatOutput,
+  renderCauseToStderr,
+  VERSION,
+} from "#shared";
 import { AuditServiceLayer, withAudit } from "#shared/audit";
 import { K8sService, K8sServiceLayer } from "./service";
 import { ConfigService, ConfigServiceLayer, getDefaultEnvironment, getToolConfig } from "#config";
@@ -415,6 +421,8 @@ const topCommand = Command.make(
     }),
 ).pipe(Command.withDescription("Show pod CPU/memory usage (kubectl top pod)"));
 
+const commandsCommand = makeSchemaCommand(() => mainCommand);
+
 const mainCommand = Command.make("k8s-tool", {}).pipe(
   Command.withDescription("Kubernetes CLI Tool for Coding Agents"),
   Command.withSubcommands([
@@ -424,6 +432,7 @@ const mainCommand = Command.make("k8s-tool", {}).pipe(
     describeCommand,
     execCommand,
     topCommand,
+    commandsCommand,
   ]),
 );
 

package/src/logs-tool/index.ts

@@ -20,7 +20,13 @@ import { Console, Effect, Layer, Option, Result } from "effect";
 
 import type { Environment, LogResult, ReadOptions } from "./types";
 
-import { formatOption, formatOutput, renderCauseToStderr, VERSION } from "#shared";
+import {
+  makeSchemaCommand,
+  formatOption,
+  formatOutput,
+  renderCauseToStderr,
+  VERSION,
+} from "#shared";
 import { AuditServiceLayer, withAudit } from "#shared/audit";
 import { ConfigService, ConfigServiceLayer, getDefaultEnvironment } from "#config";
 import { LogsConfigError, LogsNotFoundError, LogsReadError, LogsTimeoutError } from "./errors";
@@ -214,9 +220,11 @@ const readCommand = Command.make(
     }),
 ).pipe(Command.withDescription("Read application logs"));
 
+const commandsCommand = makeSchemaCommand(() => mainCommand);
+
 const mainCommand = Command.make("logs-tool", {}).pipe(
   Command.withDescription("Application Logs Tool for Coding Agents"),
-  Command.withSubcommands([listCommand, readCommand]),
+  Command.withSubcommands([listCommand, readCommand, commandsCommand]),
 );
 
 const cli = Command.run(mainCommand, {

package/src/observability-tool/index.ts

@@ -7,7 +7,7 @@ import { Command } from "effect/unstable/cli";
 
 import { ConfigServiceLayer } from "#config";
 import { AuditServiceLayer, withAudit } from "#shared/audit";
-import { VERSION } from "#shared";
+import { makeSchemaCommand, VERSION } from "#shared";
 
 import { metricsCommand } from "./metrics";
 import { logsCommand } from "./logs";
@@ -15,11 +15,13 @@ import { traceCommand } from "./trace";
 
 const renderCauseToStderr = (cause: Cause.Cause<unknown>) => Console.error(cause.toString());
 
+const commandsCommand = makeSchemaCommand(() => mainCommand);
+
 const mainCommand = Command.make("observability-tool", {}).pipe(
   Command.withDescription(
     "LGTM observability queries — Tempo traces, Loki logs, Prometheus metrics",
   ),
-  Command.withSubcommands([traceCommand, metricsCommand, logsCommand]),
+  Command.withSubcommands([traceCommand, metricsCommand, logsCommand, commandsCommand]),
 );
 
 const cli = Command.run(mainCommand, { version: VERSION });

package/src/session-tool/index.ts

@@ -13,7 +13,7 @@ import { Console, Effect, Layer, Result } from "effect";
 
 import type { MessageSummary, SessionResult, SessionSource } from "./types";
 
-import { formatOption, formatOutput, VERSION } from "#shared";
+import { makeSchemaCommand, formatOption, formatOutput, VERSION } from "#shared";
 import { AuditServiceLayer, withAudit } from "#shared/audit";
 import { ResolvedPaths, ResolvedPathsLayer } from "./config";
 import { SessionStorageNotFoundError } from "./errors";
@@ -289,9 +289,11 @@ const readCommand = Command.make(
     }),
 ).pipe(Command.withDescription("Read all messages from a session"));
 
+const commandsCommand = makeSchemaCommand(() => mainCommand);
+
 const mainCommand = Command.make("session-tool", {}).pipe(
   Command.withDescription("OpenCode session history tool"),
-  Command.withSubcommands([listCommand, readCommand, searchCommand]),
+  Command.withSubcommands([listCommand, readCommand, searchCommand, commandsCommand]),
 );
 
 const cli = Command.run(mainCommand, {

package/src/shared/index.ts

@@ -8,6 +8,8 @@ export { commonArgOptions, parseCommonArgs } from "./cli";
 
 export { renderCauseToStderr } from "./error-renderer";
 
+export { dumpCommandSchema, makeSchemaCommand, type CommandSchema } from "./schema-dump";
+
 // eslint-disable-next-line import/no-relative-parent-imports -- package.json lives at project root, outside src/
 import pkg from "../../package.json" with { type: "json" };
 export const VERSION = pkg.version;

package/src/shared/schema-dump.ts

@@ -0,0 +1,94 @@
+import { Command } from "effect/unstable/cli";
+import { Option } from "effect";
+
+import { formatOption, logFormatted } from "./format";
+
+/**
+ * Machine-readable command-tree dump so an agent can discover the whole CLI surface in ONE call
+ * instead of repeated `--help` round-trips (the top remaining discovery friction in the usage audit).
+ */
+export type FlagSchema = {
+  readonly name: string;
+  readonly type?: string;
+  readonly choices?: readonly string[];
+  readonly description?: string;
+  readonly aliases?: readonly string[];
+};
+
+export type CommandSchema = {
+  readonly name: string;
+  readonly description?: string;
+  readonly flags: readonly FlagSchema[];
+  readonly subcommands: readonly CommandSchema[];
+};
+
+// Leaf parameter from effect/unstable/cli; carries the user-facing flag name/description/type.
+type SingleParam = {
+  readonly _tag: "Single";
+  readonly name: string;
+  readonly description: Option.Option<string>;
+  readonly aliases?: readonly string[];
+  readonly primitiveType?: { readonly _tag?: string; readonly choiceKeys?: readonly string[] };
+};
+
+// Minimal view of the (partly internal) Command runtime shape we walk. Public fields: name,
+// description, subcommands; `config.flags` is internal but stable, read defensively.
+type CommandNode = {
+  readonly name: string;
+  readonly description?: string;
+  readonly subcommands?: ReadonlyArray<{ readonly commands?: ReadonlyArray<unknown> }>;
+  readonly config?: { readonly flags?: ReadonlyArray<unknown> };
+};
+
+const isObject = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null;
+
+// Flags wrap as Optional/Map/Transform/Variadic around a leaf Single; descend via `.param`.
+const unwrapToSingle = (param: unknown): SingleParam | undefined => {
+  let current: unknown = param;
+  for (let depth = 0; depth < 16 && isObject(current); depth++) {
+    if (current._tag === "Single" && typeof current.name === "string") {
+      return current as unknown as SingleParam;
+    }
+    current = current.param;
+  }
+  return undefined;
+};
+
+const flagToSchema = (param: unknown): FlagSchema | undefined => {
+  const single = unwrapToSingle(param);
+  if (!single) return undefined;
+  const primitive = single.primitiveType;
+  const choices = primitive?.choiceKeys;
+  return {
+    name: single.name,
+    type: primitive?._tag,
+    choices: choices && choices.length > 0 ? choices : undefined,
+    description: Option.getOrUndefined(single.description),
+    aliases: single.aliases && single.aliases.length > 0 ? single.aliases : undefined,
+  };
+};
+
+export const dumpCommandSchema = (command: unknown): CommandSchema => {
+  const node = command as CommandNode;
+  const flags = (node.config?.flags ?? [])
+    .map(flagToSchema)
+    .filter((flag): flag is FlagSchema => flag !== undefined);
+  const subcommands = (node.subcommands ?? [])
+    .flatMap((group) => group.commands ?? [])
+    .map(dumpCommandSchema);
+  return { name: node.name, description: node.description, flags, subcommands };
+};
+
+/**
+ * Builds the `commands` subcommand for a tool. Pass a thunk returning the tool's root command so the
+ * dump reflects the fully-assembled tree (the root is defined after its subcommands, incl. this one).
+ */
+export const makeSchemaCommand = (getRoot: () => unknown) =>
+  Command.make("commands", { format: formatOption }, ({ format }) =>
+    logFormatted(dumpCommandSchema(getRoot()), format),
+  ).pipe(
+    Command.withDescription(
+      "Dump the full command tree (names, descriptions, flags, types) as structured output — fetch once instead of repeated --help.",
+    ),
+  );