openk8s 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openk8s",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "A terminal UI for Kubernetes",
   "license": "MIT",
   "type": "module",

package/src/app/__tests__/utils.test.ts

@@ -18,6 +18,8 @@ import {
   defaultNamespace,
   selectedRef,
   selectedForwardsForRef,
+  truncate,
+  formatClusterName,
 } from "../utils";
 import type { ResourceListItem, ActivePortForward, ResourceDetail, NamespaceItem, ResourceKind } from "../../lib/k8s/types";
 
@@ -333,6 +335,58 @@ describe("selectedRef", () => {
   });
 });
 
+// ── truncate ──────────────────────────────────────────────────────────────────
+
+describe("truncate", () => {
+  test("returns string as-is when within limit", () => {
+    expect(truncate("hello", 10)).toBe("hello");
+  });
+
+  test("truncates with ellipsis when over limit", () => {
+    expect(truncate("hello world", 5)).toBe("hell\u2026");
+  });
+
+  test("handles empty string", () => {
+    expect(truncate("", 5)).toBe("");
+  });
+
+  test("handles exact match", () => {
+    expect(truncate("hello", 5)).toBe("hello");
+  });
+
+  test("handles single-char limit", () => {
+    expect(truncate("ab", 1)).toBe("\u2026");
+  });
+});
+
+// ── formatClusterName ─────────────────────────────────────────────────────────
+
+describe("formatClusterName", () => {
+  test("formats EKS ARN", () => {
+    expect(formatClusterName("arn:aws:eks:us-east-1:123456789012:cluster/my-cluster", 30)).toBe("aws/eks/my-cluster");
+  });
+
+  test("truncates long EKS cluster name", () => {
+    expect(formatClusterName("arn:aws:eks:us-east-1:123456789012:cluster/this-name-is-way-too-long", 20)).toBe("aws/eks/this-name-i\u2026");
+  });
+
+  test("passes through non-ARN names", () => {
+    expect(formatClusterName("minikube", 30)).toBe("minikube");
+  });
+
+  test("truncates long non-ARN names", () => {
+    expect(formatClusterName("this-context-name-is-very-long", 15)).toBe("this-context-n\u2026");
+  });
+
+  test("handles empty string", () => {
+    expect(formatClusterName("", 10)).toBe("");
+  });
+
+  test("handles EKS name with hyphens and dots", () => {
+    expect(formatClusterName("arn:aws:eks:eu-west-2:123456789012:cluster/prod.blue-123", 30)).toBe("aws/eks/prod.blue-123");
+  });
+});
+
 // ── selectedForwardsForRef ──────────────────────────────────────────────────
 
 describe("selectedForwardsForRef", () => {

package/src/app/app.tsx

@@ -22,11 +22,13 @@ import {
 import {
   currentKindLabel,
   filterResources,
+  formatClusterName,
   nextVisibleResourceName,
   resourcePreview,
   selectedForwardsForRef,
   selectedRef,
   statusLine,
+  truncate,
 } from "./utils";
 import { usePollingTick } from "./use-polling-tick";
 import { useFooterHints, useFooterHintRows } from "./use-footer-hints";
@@ -365,14 +367,18 @@ export function App() {
             padding: 1,
           }}
         >
-          <text fg={TEXT_PRIMARY}>
-            <span fg={KEY_HINT}>{GLYPHS.cluster}</span>
-            {` ${state.activeContext ?? "none"}`}
-          </text>
-          <text fg={TEXT_SUBTLE} attributes={TEXT_MUTED}>
-            <span fg={KEY_HINT}>{GLYPHS.ns}</span>
-            {` ${state.activeNamespace}`}
-          </text>
+          <box style={{ width: "100%" }}>
+            <text fg={TEXT_PRIMARY}>
+              <span fg={KEY_HINT}>{GLYPHS.cluster}</span>
+              {` ${formatClusterName(state.activeContext ?? "none", 26)}`}
+            </text>
+          </box>
+          <box style={{ width: "100%" }}>
+            <text fg={TEXT_SUBTLE} attributes={TEXT_MUTED}>
+              <span fg={KEY_HINT}>{GLYPHS.ns}</span>
+              {` ${truncate(state.activeNamespace, 26)}`}
+            </text>
+          </box>
           <KindRows
             resourceKinds={state.resourceKinds}
             selectedKind={state.selectedKind}

package/src/app/components/overlays/index.ts

@@ -7,6 +7,6 @@ export {
   type PortForwardOverlayProps,
   buildPortForwardEntries,
 } from "./port-forward-overlay";
-export { LogsDialog, type LogsDialogActions, type LogsDialogProps, logLineColor } from "./logs-dialog";
+export { LogsDialog, type LogsDialogActions, type LogsDialogProps } from "./logs-dialog";
 export { ScaleDialog, type ScaleDialogProps } from "./scale-dialog";
 export { HelmRollbackOverlay, type HelmRollbackOverlayProps } from "./helm-rollback-overlay";

package/src/app/components/overlays/logs-dialog.tsx

@@ -14,16 +14,6 @@ import {
 } from "../../theme";
 import type { LoadStatus, LogOptions } from "../../../lib/k8s/types";
 
-function logLineColor(line: string): string {
-  const lower = line.toLowerCase();
-  if (/\b(error|err|fatal|panic|critical)\b/.test(lower)) return toneStyles("danger").fg;
-  if (/\bwarn(?:ing)?\b/.test(lower)) return toneStyles("warning").fg;
-  if (/\binfo(?:rmation)?\b/.test(lower)) return toneStyles("info").fg;
-  if (/\bdebug\b/.test(lower)) return TEXT_SUBTLE;
-  if (/\btrace\b/.test(lower)) return YAML_COMMENT;
-  return TEXT_SUBTLE;
-}
-
 export interface LogsDialogActions {
   nextMatch: () => void;
   prevMatch: () => void;
@@ -184,7 +174,7 @@ export function LogsDialog({
                 const matched = line.slice(matchStart, matchStart + searchText.length);
                 const after = line.slice(matchStart + searchText.length);
                 return (
-                  <text key={`${index}:${line}`} fg={logLineColor(line)}>
+                  <text key={`${index}:${line}`} fg={TEXT_SUBTLE}>
                     {before}
                     <span fg={warningFg} attributes={isCurrentMatch ? TextAttributes.BOLD : TextAttributes.DIM}>
                       {matched}
@@ -194,7 +184,7 @@ export function LogsDialog({
                 );
               }
               return (
-                <text key={`${index}:${line}`} fg={logLineColor(line)}>
+                <text key={`${index}:${line}`} fg={TEXT_SUBTLE}>
                   {line}
                 </text>
               );
@@ -300,4 +290,4 @@ export function LogsDialog({
   );
 }
 
-export { logLineColor };
+

package/src/app/hooks/keyboard/shell-edit-handlers.ts

@@ -35,10 +35,22 @@ export function handleShellKeys(
     const target = activeResourceRef;
 
     const child = kubectl.startShell({ context, namespace, resourceRef: target, namespaced });
-    child.on("close", () => {
+
+    let stderrBuffer = "";
+    child.stderr?.on("data", (chunk: Buffer) => {
+      stderrBuffer += chunk.toString();
+    });
+
+    child.on("close", (code) => {
       renderer.resume();
       dispatch({ type: "setError", error: undefined });
-      dispatch({ type: "setStatusMessage", message: `Returned from shell in ${statusLine({ ref: target })}` });
+      if (code === 0) {
+        dispatch({ type: "setStatusMessage", message: `Returned from shell in ${statusLine({ ref: target })}` });
+      } else {
+        const msg = stderrBuffer.trim() || `Shell exited with code ${code}`;
+        toastError(new Error(msg));
+        dispatch({ type: "setStatusMessage", message: `Shell failed for ${statusLine({ ref: target })}` });
+      }
       setManualRefreshNonce((current) => current + 1);
     });
     child.on("error", (error) => {

package/src/app/hooks/use-data-fetching.ts

@@ -183,7 +183,9 @@ export function useDataFetching(
     let cancelled = false;
 
     async function loadResources(): Promise<void> {
-      dispatch({ type: "setResourcesStatus", status: "loading" });
+      if (resourcesLengthRef.current === 0) {
+        dispatch({ type: "setResourcesStatus", status: "loading" });
+      }
 
       try {
         const resources = await kubectl.listResources({

package/src/app/utils.ts

@@ -260,6 +260,22 @@ export function selectedRef(options: SelectedRefOptions): ResourceRef | undefine
   return options.resource?.ref;
 }
 
+const EKS_ARN_RE = /^arn:aws:eks:[^:]+:\d{12}:cluster\/(.+)$/;
+
+export function truncate(s: string, maxLen: number): string {
+  if (s.length <= maxLen) return s;
+  return s.slice(0, maxLen - 1) + "\u2026";
+}
+
+export function formatClusterName(name: string, maxLen: number): string {
+  const match = name.match(EKS_ARN_RE);
+  if (match) {
+    const label = `aws/eks/${match[1]}`;
+    return truncate(label, maxLen);
+  }
+  return truncate(name, maxLen);
+}
+
 export function selectedForwardsForRef(options: SelectedForwardsForRefOptions): ActivePortForward[] {
   if (!options.ref) {
     return [];

package/src/lib/kubectl/kubectl-service.ts

@@ -380,7 +380,7 @@ export class KubectlService {
 
     args.push("exec", "-it", target, "--", "sh", "-lc", "exec ${SHELL:-/bin/sh}");
 
-    return startPersistentProcess({ command: "kubectl", args, stdio: "inherit" });
+    return startPersistentProcess({ command: "kubectl", args, stdio: ["inherit", "inherit", "pipe"] });
   }
 
   editResource(options: EditResourceOptions): ChildProcess {