@blogic-cz/agent-tools 0.15.5 → 0.15.6

package/package.json

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

package/src/k8s-tool/index.ts

@@ -17,6 +17,7 @@ import { K8sService, K8sServiceLayer } from "./service";
 import { ConfigService, ConfigServiceLayer, getDefaultEnvironment, getToolConfig } from "#config";
 import type { K8sConfig } from "#config";
 import { K8sContextError } from "./errors";
+import { hasKubernetesConfig, selectK8sProfile } from "./profile";
 import {
   transformDescribe,
   transformGenericKubectl,
@@ -60,6 +61,21 @@ const resolveEnv = (
     });
   });
 
+const resolveEnvAndProfile = (
+  envOption: Option.Option<string>,
+  profileOption: Option.Option<string>,
+  config: Parameters<typeof getDefaultEnvironment>[0],
+) =>
+  Effect.gen(function* () {
+    const resolvedEnv = yield* resolveEnv(envOption, config);
+    const profileName = selectK8sProfile(
+      config?.kubernetes,
+      Option.getOrUndefined(profileOption),
+      resolvedEnv,
+    );
+    return { env: resolvedEnv, profile: profileName };
+  });
+
 type CommonK8sCommandOptions = {
   readonly env: Option.Option<string>;
   readonly dryRun: boolean;
@@ -67,26 +83,36 @@ type CommonK8sCommandOptions = {
   readonly profile: Option.Option<string>;
 };
 
+const noKubernetesConfigResult = (): CommandResult => ({
+  success: false,
+  error: "No Kubernetes configuration found",
+  hint: "Add a 'kubernetes' section to agent-tools.json5 with clusterId and namespaces.",
+  nextCommand:
+    "echo '{ kubernetes: { default: { clusterId: \"my-cluster\" } } }' > agent-tools.json5",
+  executionTimeMs: 0,
+});
+
 const executeK8sCommand = (command: string, options: CommonK8sCommandOptions) =>
   Effect.gen(function* () {
     const config = yield* ConfigService;
-    const profileName = Option.getOrUndefined(options.profile);
+
+    // Check for a missing 'kubernetes' section before resolving --env, so that case still
+    // surfaces "add a kubernetes section" instead of an env-resolution error (e.g. prod-safety).
+    if (!hasKubernetesConfig(config?.kubernetes)) {
+      return noKubernetesConfigResult();
+    }
+
+    const { env: resolvedEnv, profile: profileName } = yield* resolveEnvAndProfile(
+      options.env,
+      options.profile,
+      config,
+    );
     const k8sConfig = getToolConfig<K8sConfig>(config, "kubernetes", profileName);
 
     if (!k8sConfig) {
-      const result: CommandResult = {
-        success: false,
-        error: "No Kubernetes configuration found",
-        hint: "Add a 'kubernetes' section to agent-tools.json5 with clusterId and namespaces.",
-        nextCommand:
-          "echo '{ kubernetes: { default: { clusterId: \"my-cluster\" } } }' > agent-tools.json5",
-        executionTimeMs: 0,
-      };
-      return result;
+      return noKubernetesConfigResult();
     }
 
-    const resolvedEnv = yield* resolveEnv(options.env, config);
-
     const k8sService = yield* K8sService;
     const result = yield* k8sService.runKubectl(command, options.dryRun, profileName).pipe(
       Effect.catchTags({
@@ -190,8 +216,11 @@ const resolveStructuredNamespace = (
     if (explicitNamespace) return explicitNamespace;
 
     const config = yield* ConfigService;
-    const resolvedEnv = yield* resolveEnv(envOption, config);
-    const profileName = Option.getOrUndefined(profileOption);
+    const { env: resolvedEnv, profile: profileName } = yield* resolveEnvAndProfile(
+      envOption,
+      profileOption,
+      config,
+    );
     const k8sConfig = getToolConfig<K8sConfig>(config, "kubernetes", profileName);
 
     if (!k8sConfig) return undefined;

package/src/k8s-tool/profile.ts

@@ -0,0 +1,22 @@
+// --profile wins if given; else a kubernetes.<env> section (different cluster per env) wins; else undefined (getToolConfig default).
+export function selectK8sProfile(
+  kubernetesSection: Record<string, unknown> | undefined,
+  explicitProfile: string | undefined,
+  resolvedEnv: string,
+): string | undefined {
+  if (explicitProfile) {
+    return explicitProfile;
+  }
+
+  if (kubernetesSection && Object.hasOwn(kubernetesSection, resolvedEnv)) {
+    return resolvedEnv;
+  }
+
+  return undefined;
+}
+
+export function hasKubernetesConfig(
+  kubernetesSection: Record<string, unknown> | undefined,
+): boolean {
+  return !!kubernetesSection && Object.keys(kubernetesSection).length > 0;
+}