@blogic-cz/agent-tools 0.14.3 → 0.14.5

package/package.json

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

package/src/db-tool/service.ts

@@ -76,6 +76,7 @@ export class DbService extends Context.Service<
         const remotePort = dbConfig.remotePort ?? 5432;
 
         const zshrcEnvCache = yield* Ref.make<Record<string, string> | null>(null);
+        const envTemplateRegex = /^\$\{([A-Za-z0-9_]+)\}$/;
 
         const loadEnvFromZshrc = Effect.fn("DbService.loadEnvFromZshrc")(function* () {
           const cached = yield* Ref.get(zshrcEnvCache);
@@ -141,6 +142,42 @@ export class DbService extends Context.Service<
           return "";
         });
 
+        const resolveConfigString = Effect.fn("DbService.resolveConfigString")(function* (
+          value: string,
+          env: string,
+          label: string,
+          zshrcEnv: Record<string, string>,
+        ) {
+          const match = value.match(envTemplateRegex);
+          if (!match) return value;
+
+          const envVar = match[1];
+          const fromEnv = Bun.env[envVar];
+          if (fromEnv !== undefined) return fromEnv;
+
+          const fromZsh = zshrcEnv[envVar];
+          if (fromZsh !== undefined) return fromZsh;
+
+          return yield* new DbConnectionError({
+            message: `Environment variable ${envVar} (required for '${label}' config field) is not set in environment ${env}.`,
+            environment: env,
+          });
+        });
+
+        const resolveDbConfig = Effect.fn("DbService.resolveDbConfig")(function* (
+          config: DbConfig,
+          env: string,
+        ) {
+          const needsEnvResolution =
+            envTemplateRegex.test(config.user) || envTemplateRegex.test(config.database);
+          const zshrcEnv = needsEnvResolution ? yield* loadEnvFromZshrc() : {};
+          return {
+            ...config,
+            user: yield* resolveConfigString(config.user, env, "user", zshrcEnv),
+            database: yield* resolveConfigString(config.database, env, "database", zshrcEnv),
+          };
+        });
+
         const executeShellCommand = (command: ChildProcess.Command) =>
           Effect.scoped(
             Effect.gen(function* () {
@@ -183,6 +220,7 @@ export class DbService extends Context.Service<
             dbConfig,
             (command, _label) => executeShellCommand(command),
             effect,
+            { tryWithoutPrerequisites: true },
           ).pipe(
             Effect.mapError((error) =>
               isPrerequisiteRunError(error)
@@ -583,10 +621,11 @@ export class DbService extends Context.Service<
         ) {
           const config = getConfigForEnv(env);
           const startTimeMs = yield* Clock.currentTimeMillis;
-          const password = yield* resolvePassword(config, env);
+          const resolvedConfig = yield* resolveDbConfig(config, env);
+          const password = yield* resolvePassword(resolvedConfig, env);
           const mutation = isMutationQuery(sql);
 
-          if (mutation && !config.allowMutations) {
+          if (mutation && !resolvedConfig.allowMutations) {
             return yield* new DbMutationBlockedError({
               message:
                 "Mutation queries (UPDATE, INSERT, DELETE, etc.) are not allowed on this environment. Use a local environment for mutations.",
@@ -595,12 +634,12 @@ export class DbService extends Context.Service<
           }
 
           const queryEffect = mutation
-            ? executeMutationQuery(config, sql, password, Number(startTimeMs))
-            : executeSelectQuery(config, sql, password, Number(startTimeMs), true);
+            ? executeMutationQuery(resolvedConfig, sql, password, Number(startTimeMs))
+            : executeSelectQuery(resolvedConfig, sql, password, Number(startTimeMs), true);
 
           return yield* runWithVpnPrerequisites(
-            config.port,
-            runQueryWithOptionalTunnel(config, queryEffect),
+            resolvedConfig.port,
+            runQueryWithOptionalTunnel(resolvedConfig, queryEffect),
           );
         });
 
@@ -611,7 +650,8 @@ export class DbService extends Context.Service<
         ) {
           const config = getConfigForEnv(env);
           const startTimeMs = yield* Clock.currentTimeMillis;
-          const password = yield* resolvePassword(config, env);
+          const resolvedConfig = yield* resolveDbConfig(config, env);
+          const password = yield* resolvePassword(resolvedConfig, env);
 
           if (mode === "columns" && !table) {
             const endTime = yield* Clock.currentTimeMillis;
@@ -636,16 +676,26 @@ export class DbService extends Context.Service<
 
           const queryEffect =
             mode === "tables"
-              ? executeSelectQuery(config, getTableNames(), password, Number(startTimeMs))
+              ? executeSelectQuery(resolvedConfig, getTableNames(), password, Number(startTimeMs))
               : mode === "columns"
-                ? executeSelectQuery(config, getColumns(table ?? ""), password, Number(startTimeMs))
+                ? executeSelectQuery(
+                    resolvedConfig,
+                    getColumns(table ?? ""),
+                    password,
+                    Number(startTimeMs),
+                  )
                 : mode === "relationships"
-                  ? executeSelectQuery(config, getRelationships(), password, Number(startTimeMs))
-                  : executeFullSchemaQuery(config, password, Number(startTimeMs));
+                  ? executeSelectQuery(
+                      resolvedConfig,
+                      getRelationships(),
+                      password,
+                      Number(startTimeMs),
+                    )
+                  : executeFullSchemaQuery(resolvedConfig, password, Number(startTimeMs));
 
           const result = yield* runWithVpnPrerequisites(
-            config.port,
-            runQueryWithOptionalTunnel(config, queryEffect),
+            resolvedConfig.port,
+            runQueryWithOptionalTunnel(resolvedConfig, queryEffect),
           );
 
           if (result.success) {

package/src/k8s-tool/service.ts

@@ -220,6 +220,7 @@ export class K8sService extends Context.Service<
                 command: fullCommand,
               };
             }),
+            { tryWithoutPrerequisites: true },
           ).pipe(
             Effect.mapError((error) =>
               isPrerequisiteRunError(error)

package/src/shared/prerequisites/runtime.ts

@@ -116,6 +116,7 @@ export const runWithProfilePrerequisites = <A, E, CommandError>(
   profile: ProfilePrerequisites,
   runCommand: PrerequisiteCommandRunner<CommandError>,
   effect: Effect.Effect<A, E, never>,
+  options?: { tryWithoutPrerequisites?: boolean },
 ): Effect.Effect<A, E | PrerequisiteRunError, never> => {
   const prerequisites = normalizeProfilePrerequisites(profile);
   const vpnPrerequisites = prerequisites.filter((prerequisite) => prerequisite.type === "vpn");
@@ -125,6 +126,13 @@ export const runWithProfilePrerequisites = <A, E, CommandError>(
   }
 
   return Effect.gen(function* () {
+    if (options?.tryWithoutPrerequisites) {
+      const directResult = yield* effect.pipe(Effect.result);
+      if (Result.isSuccess(directResult)) {
+        return directResult.success;
+      }
+    }
+
     const startedDrivers: Array<{ driver: ResolvedVpnDriver; cooldownMs: number }> = [];
 
     for (const prerequisite of vpnPrerequisites) {