openk8s 1.0.4 → 1.0.5

package/package.json

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

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/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 {