@blogic-cz/agent-tools 0.14.20 → 0.14.22

package/README.md

@@ -383,6 +383,39 @@ Secrets are **never** stored in the config file. The `db-tool` config references
 }
 ```
 
+Database VPN prerequisites can be set at the database profile or environment level. If an environment declares `vpn` or `prerequisites`, that environment config replaces the profile prerequisites; `prerequisites: []` explicitly disables inherited VPN setup. DB commands try the query directly first and only connect VPN prerequisites if direct access fails.
+
+```json5
+{
+  vpns: {
+    officeVpn: { name: "OfficeVPN" },
+    prodVpn: { name: "ProdVPN" },
+  },
+  database: {
+    default: {
+      vpn: "officeVpn",
+      environments: {
+        local: {
+          host: "127.0.0.1",
+          port: 5432,
+          user: "app",
+          database: "app",
+          prerequisites: [], // no VPN for local/direct access
+        },
+        prod: {
+          host: "db.prod.internal",
+          port: 5432,
+          user: "readonly",
+          database: "app",
+          passwordEnvVar: "AGENT_TOOLS_DB_PROD_PASSWORD",
+          vpn: "prodVpn", // overrides database.default.vpn
+        },
+      },
+    },
+  },
+}
+```
+
 Set the values in your shell:
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blogic-cz/agent-tools",
-  "version": "0.14.20",
+  "version": "0.14.22",
   "description": "CLI tools for AI coding agent workflows — GitHub, database, Kubernetes, Azure DevOps, logs, sessions, and audit",
   "keywords": [
     "agent",

package/schemas/agent-tools.schema.json

@@ -185,6 +185,17 @@
         "passwordEnvVar": {
           "description": "Name of the environment variable holding the database password.",
           "type": "string"
+        },
+        "prerequisites": {
+          "description": "Ordered prerequisite references for this database environment. Declaring this or vpn overrides profile-level database prerequisites; an empty array explicitly disables inherited prerequisites.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Prerequisite"
+          }
+        },
+        "vpn": {
+          "type": "string",
+          "description": "Convenience sugar for this database environment's VPN prerequisite key. Declaring this or prerequisites overrides profile-level database prerequisites."
         }
       },
       "required": ["host", "port", "user", "database"]

package/src/config/loader.ts

@@ -91,6 +91,8 @@ const DbEnvConfigSchema = Schema.Struct({
   database: Schema.String,
   password: Schema.optionalKey(Schema.String),
   passwordEnvVar: Schema.optionalKey(Schema.String),
+  prerequisites: Schema.optionalKey(PrerequisitesSchema),
+  vpn: Schema.optionalKey(Schema.String),
 });
 
 const DatabaseConfigSchema = Schema.Struct({

package/src/config/types.ts

@@ -74,7 +74,7 @@ export type K8sConfig = ProfilePrerequisites & {
 };
 
 /** Single database environment connection details */
-export type DbEnvConfig = {
+export type DbEnvConfig = ProfilePrerequisites & {
   host: string;
   port: number;
   user: string;

package/src/db-tool/service.ts

@@ -6,6 +6,7 @@ import type { DbConfig, DbMutationOperation, QueryResult, SchemaMode } from "./t
 import { ConfigService } from "#config";
 import { isPrerequisiteRunError } from "#shared/prerequisites/errors";
 import { resolveEnvTemplate } from "#shared/env-template";
+import { resolveEnvironmentScopedPrerequisites } from "#shared/prerequisites/config";
 import { runWithProfilePrerequisites } from "#shared/prerequisites/runtime";
 import { DbConfigService, DbConfigServiceLayer, TUNNEL_CHECK_INTERVAL_MS } from "./config-service";
 import {
@@ -228,13 +229,15 @@ export class DbService extends Context.Service<
 
         const runWithVpnPrerequisites = <E>(
           port: number,
+          prerequisiteConfig: DbConfig,
           effect: Effect.Effect<QueryResult, E>,
         ): Effect.Effect<QueryResult, E | DbTunnelError> =>
           runWithProfilePrerequisites(
             agentToolsConfig ?? {},
-            dbConfig,
+            prerequisiteConfig,
             (command, _label) => executeShellCommand(command),
             effect,
+            { tryWithoutPrerequisites: true },
           ).pipe(
             Effect.mapError((error) =>
               isPrerequisiteRunError(error)
@@ -655,6 +658,7 @@ export class DbService extends Context.Service<
             database: envConfig.database,
             password: envConfig.password,
             passwordEnvVar: envConfig.passwordEnvVar,
+            ...resolveEnvironmentScopedPrerequisites(dbConfig, envConfig),
             port: envConfig.port,
             needsTunnel: accessMode.needsTunnel,
             allowMutations: accessMode.allowMutations,
@@ -696,6 +700,7 @@ export class DbService extends Context.Service<
 
           return yield* runWithVpnPrerequisites(
             resolvedConfig.port,
+            resolvedConfig,
             runQueryWithOptionalTunnel(resolvedConfig, queryEffect),
           );
         });
@@ -752,6 +757,7 @@ export class DbService extends Context.Service<
 
           const result = yield* runWithVpnPrerequisites(
             resolvedConfig.port,
+            resolvedConfig,
             runQueryWithOptionalTunnel(resolvedConfig, queryEffect),
           );
 

package/src/db-tool/types.ts

@@ -1,4 +1,5 @@
 import type { DbMutationOperation } from "#config";
+import type { ProfilePrerequisites } from "#config/types";
 import type { Environment, OutputFormat } from "#shared";
 
 export type { DbMutationOperation };
@@ -6,7 +7,7 @@ export type { Environment, OutputFormat };
 
 export type SchemaMode = "tables" | "columns" | "full" | "relationships";
 
-export type DbConfig = {
+export type DbConfig = ProfilePrerequisites & {
   host: string;
   user: string;
   database: string;

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

@@ -119,6 +119,7 @@ export const prCreateCommand = Command.make(
 export const prEditCommand = Command.make(
   "edit",
   {
+    base: Flag.string("base").pipe(Flag.withDescription("New base branch"), Flag.optional),
     body: Flag.string("body").pipe(Flag.withDescription("New PR body/description"), Flag.optional),
     bodyFile: Flag.string("body-file").pipe(
       Flag.withDescription("Read PR body from a file path or '-' for stdin"),
@@ -128,7 +129,7 @@ export const prEditCommand = Command.make(
     pr: Flag.integer("pr").pipe(Flag.withDescription("PR number to edit")),
     title: Flag.string("title").pipe(Flag.withDescription("New PR title"), Flag.optional),
   },
-  ({ body, bodyFile, format, pr, title }) =>
+  ({ base, body, bodyFile, format, pr, title }) =>
     Effect.gen(function* () {
       const resolvedBody = yield* resolveOptionalTextInput(
         "gh-tool pr edit",
@@ -143,6 +144,7 @@ export const prEditCommand = Command.make(
         pr,
         title: Option.getOrNull(title),
         body: resolvedBody,
+        base: Option.getOrNull(base),
       });
       yield* logFormatted(info, format);
     }),

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

@@ -8,6 +8,7 @@ import type {
   MergeResult,
   MergeStrategy,
   PRInfo,
+  PRViewInfo,
   WorkflowRunDetail,
 } from "#gh/types";
 
@@ -243,9 +244,9 @@ export const viewPR = Effect.fn("pr.viewPR")(function* (prNumber: number | null)
   if (prNumber !== null) {
     args.push(String(prNumber));
   }
-  args.push("--json", "number,url,title,headRefName,baseRefName,state,isDraft,mergeable");
+  args.push("--json", "number,url,title,headRefName,baseRefName,state,isDraft,mergeable,body");
 
-  const info = yield* gh.runGhJson<PRInfo>(args);
+  const info = yield* gh.runGhJson<PRViewInfo>(args);
   return info;
 });
 
@@ -632,14 +633,15 @@ export const editPR = Effect.fn("pr.editPR")(function* (opts: {
   pr: number;
   title: string | null;
   body: string | null;
+  base: string | null;
 }) {
-  if (!opts.title && !opts.body) {
+  if (!opts.title && !opts.body && !opts.base) {
     return yield* Effect.fail(
       new GitHubCommandError({
         command: "pr edit",
         exitCode: 1,
-        stderr: "At least one of --title or --body must be provided",
-        message: "At least one of --title or --body must be provided",
+        stderr: "At least one of --title, --body, or --base must be provided",
+        message: "At least one of --title, --body, or --base must be provided",
       }),
     );
   }
@@ -654,6 +656,9 @@ export const editPR = Effect.fn("pr.editPR")(function* (opts: {
   if (opts.body) {
     editArgs.push("--body", opts.body);
   }
+  if (opts.base) {
+    editArgs.push("--base", opts.base);
+  }
 
   yield* gh.runGh(editArgs);
 

package/src/gh-tool/types.ts

@@ -13,6 +13,10 @@ export type PRInfo = {
   mergeable: "MERGEABLE" | "CONFLICTING" | "UNKNOWN";
 };
 
+export type PRViewInfo = PRInfo & {
+  body: string;
+};
+
 export type ReviewThread = {
   threadId: string;
   commentId: number;

package/src/shared/prerequisites/config.ts

@@ -36,3 +36,22 @@ export function resolveProfilePrerequisites(
 
   return { success: true, prerequisites };
 }
+
+const hasOwnPrerequisiteConfig = (profile: ProfilePrerequisites, key: keyof ProfilePrerequisites) =>
+  Object.prototype.hasOwnProperty.call(profile, key);
+
+export function resolveEnvironmentScopedPrerequisites(
+  profile: ProfilePrerequisites,
+  environment: ProfilePrerequisites,
+): ProfilePrerequisites {
+  const source =
+    hasOwnPrerequisiteConfig(environment, "vpn") ||
+    hasOwnPrerequisiteConfig(environment, "prerequisites")
+      ? environment
+      : profile;
+
+  return {
+    ...(source.vpn !== undefined ? { vpn: source.vpn } : {}),
+    ...(source.prerequisites !== undefined ? { prerequisites: source.prerequisites } : {}),
+  };
+}