openk8s 1.1.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openk8s",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A terminal UI for Kubernetes",
   "license": "MIT",
   "type": "module",
@@ -55,6 +55,8 @@
   "dependencies": {
     "@opentui/core": "^0.4.1",
     "@opentui/react": "^0.4.1",
+    "@types/js-yaml": "^4.0.9",
+    "js-yaml": "^5.1.0",
     "react": "^19.2.7"
   }
 }

package/src/app/__tests__/app-state.test.ts

@@ -174,7 +174,7 @@ describe("reducer", () => {
 
   describe("setSelectedResourceDetail", () => {
     test("sets detail", () => {
-      const detail: any = { ref: { kind: "Pod", name: "test" }, summaryLines: [], summarySections: [], yaml: "" };
+      const detail: any = { ref: { kind: "Pod", name: "test" }, summarySections: [], yaml: "" };
       const state = reduce({ type: "setSelectedResourceDetail", detail });
       expect(state.selectedResourceDetail).toBe(detail);
     });

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

@@ -298,7 +298,7 @@ describe("defaultNamespace", () => {
 describe("selectedRef", () => {
   const detail: ResourceDetail = {
     ref: { kind: "Pod", name: "web", namespace: "default" },
-    summaryLines: [], summarySections: [], yaml: "",
+    summarySections: [], yaml: "",
   };
 
   test("returns detail ref when it matches resource", () => {

package/src/app/components/inspector.tsx

@@ -16,8 +16,6 @@ import type { EventItem, InspectorTab, PaneId, ResourceDetail } from "../../lib/
 export const INSPECTOR_TABS: Array<{ id: InspectorTab; label: string; hotkey: string }> = [
   { id: "summary", label: "Summary", hotkey: "s" },
   { id: "yaml", label: "YAML", hotkey: "y" },
-  { id: "events", label: "Events", hotkey: "v" },
-  { id: "describe", label: "Describe", hotkey: "i" },
 ];
 
 export interface InspectorTabsProps {
@@ -132,54 +130,28 @@ export function InspectorBody({
     );
   }
 
-  if (activeTab === "describe") {
-    return (
-      <box style={{ flexGrow: 1, flexDirection: "column" }}>
-        <box style={{ height: 1 }} />
-        <scrollbox
-          focused={active}
-          scrollX
-          horizontalScrollbarOptions={{ showArrows: false }}
-          onMouseDown={onActivate}
-          flexGrow={1}
-        >
-          <box style={{ flexDirection: "column", paddingRight: 1 }}>
-            {detail?.describe ? (
-              detail.describe.split("\n").map((line, index) => (
-                <text key={`${index}:${line}`} fg={TEXT_SUBTLE} wrapMode="none">
-                  {line || " "}
-                </text>
-              ))
-            ) : detailStatus === "loading" ? (
-              <text fg={TEXT_SUBTLE} attributes={TextAttributes.DIM}>
-                Loading describe output...
-              </text>
-            ) : (
-              <text fg={TEXT_SUBTLE} attributes={TextAttributes.DIM}>
-                No describe output available
-              </text>
-            )}
-          </box>
-        </scrollbox>
-      </box>
-    );
-  }
-
   return (
     <box style={{ flexGrow: 1, flexDirection: "column" }}>
       <box style={{ height: 1 }} />
       <scrollbox focused={active} onMouseDown={onActivate} flexGrow={1}>
         <box style={{ flexDirection: "column", width: "100%", paddingRight: 1 }}>
-          {activeTab === "events" ? (
-            <EventList events={events} status={eventsStatus} />
-          ) : detail ? (
-            <DetailSectionsInternal
-              sections={detail.summarySections}
-              revealedIds={revealedDetailLineIds}
-              revealedSecretValues={revealedSecretValues}
-              onToggleReveal={onToggleReveal}
-              onCopyText={onCopyText}
-            />
+          {detail ? (
+            <>
+              <DetailSectionsInternal
+                sections={detail.summarySections}
+                revealedIds={revealedDetailLineIds}
+                revealedSecretValues={revealedSecretValues}
+                onToggleReveal={onToggleReveal}
+                onCopyText={onCopyText}
+              />
+              <box style={{ flexDirection: "column", marginTop: 1, marginBottom: 1 }}>
+                <text fg={KEY_HINT}>
+                  {"─ "}
+                  <span fg={TEXT_PRIMARY} attributes={TextAttributes.BOLD}>Recent Events</span>
+                </text>
+                <EventList events={events} status={eventsStatus} />
+              </box>
+            </>
           ) : detailStatus === "loading" ? (
             <text fg={TEXT_SUBTLE} attributes={TextAttributes.DIM}>
               Loading resource detail...

package/src/app/components/overlays/help-overlay.tsx

@@ -23,10 +23,8 @@ const LEFT_SECTIONS: HelpSection[] = [
   {
     title: "Inspector Tabs",
     rows: [
-      ["S", "summary tab"],
+      ["S", "summary tab (incl. recent events)"],
       ["Y", "yaml tab (press again to copy)"],
-      ["V", "events tab"],
-      ["I", "describe tab"],
     ],
   },
   {

package/src/app/hooks/keyboard/global-handlers.ts

@@ -73,18 +73,6 @@ export function handleGlobalHotkeys(
     return true;
   }
 
-  // V → events tab
-  if (key.name === "v" && !key.shift) {
-    dispatch({ type: "setInspectorTab", tab: "events" });
-    return true;
-  }
-
-  // I → describe tab
-  if (key.name === "i" && !key.shift) {
-    dispatch({ type: "setInspectorTab", tab: "describe" });
-    return true;
-  }
-
   // L → logs
   if (key.name === "l" && !key.shift) {
     if (activeResourceRef) {

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

@@ -90,7 +90,7 @@ export function handleEditKeys(
 
     if (isHelm) {
       const chartName = activeDetail?.helmChart ?? "";
-      const values = activeDetail?.yaml ?? "";
+      const values = activeDetail?.helmValues ?? "";
       const tmpPath = `/tmp/openk8s-${target.name}-${Date.now()}.yaml`;
       const cleanupTmp = (): void => { try { unlinkSync(tmpPath); } catch { /* ignore */ } };
 

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

@@ -289,7 +289,7 @@ export function useDataFetching(
   useEffect(() => {
     const context = state.activeContext;
 
-    if (!context || !activeResourceRef || !selectedKind || state.inspectorTab !== "events") {
+    if (!context || !activeResourceRef || !selectedKind) {
       return;
     }
 
@@ -333,7 +333,7 @@ export function useDataFetching(
     return () => {
       cancelled = true;
     };
-  }, [activeResourceRef, selectedKind, state.activeContext, state.activeNamespace, state.inspectorTab, viewPollTick, manualRefreshNonce]);
+  }, [activeResourceRef, selectedKind, state.activeContext, state.activeNamespace, viewPollTick, manualRefreshNonce]);
 
   // Poll pod metrics when viewing pods (silent degradation on error)
   useEffect(() => {

package/src/lib/k8s/__tests__/resource-detail-builder.test.ts

@@ -12,13 +12,11 @@ describe("buildResourceDetail", () => {
       resourceKind: defaultKind,
       resource: { apiVersion: "v1", kind: "Pod", metadata },
       yaml: "apiVersion: v1\nkind: Pod",
-      describe: "Name: test-pod",
     });
 
     expect(detail.ref.kind).toBe("Pod");
     expect(detail.ref.name).toBe("test-pod");
     expect(detail.yaml).toContain("apiVersion: v1");
-    expect(detail.describe).toContain("Name: test-pod");
     expect(detail.summarySections[0]?.title).toBe("Overview");
   });
 
@@ -58,8 +56,8 @@ describe("buildResourceDetail", () => {
     });
 
     expect(detail.summarySections.some((s) => s.title === "HPA")).toBe(true);
-    expect(detail.summaryLines.some((l) => l.includes("minReplicas: 1"))).toBe(true);
-    expect(detail.summaryLines.some((l) => l.includes("maxReplicas: 10"))).toBe(true);
+    expect(detail.summarySections.some((s) => s.lines.some((l) => typeof l === "string" && l.includes("minReplicas: 1")))).toBe(true);
+    expect(detail.summarySections.some((s) => s.lines.some((l) => typeof l === "string" && l.includes("maxReplicas: 10")))).toBe(true);
   });
 
   test("builds CronJob sections", () => {
@@ -76,7 +74,7 @@ describe("buildResourceDetail", () => {
     });
 
     expect(detail.summarySections.some((s) => s.title === "CronJob")).toBe(true);
-    expect(detail.summaryLines.some((l) => l.includes("schedule"))).toBe(true);
+    expect(detail.summarySections.some((s) => s.lines.some((l) => typeof l === "string" && l.includes("schedule")))).toBe(true);
   });
 
   test("builds Node sections", () => {
@@ -116,7 +114,7 @@ describe("buildResourceDetail", () => {
     });
 
     expect(detail.summarySections.some((s) => s.title === "Event")).toBe(true);
-    expect(detail.summaryLines.some((l) => l.includes("BackOff"))).toBe(true);
+    expect(detail.summarySections.some((s) => s.lines.some((l) => typeof l === "string" && l.includes("BackOff")))).toBe(true);
   });
 
   test("builds Role sections", () => {

package/src/lib/k8s/detail-builders/event-builder.ts

@@ -7,7 +7,7 @@ function asStringOrDash(value: unknown): string {
   return asString(value) ?? "-";
 }
 
-export function buildEventSections(resource: KubernetesResource): ResourceDetailSection[] {
+export function buildEventObjectSections(resource: KubernetesResource): ResourceDetailSection[] {
   const raw = asRecord(resource) ?? {};
   const involvedObject = asRecord(raw.involvedObject) ?? {};
   const source = asRecord(raw.source) ?? {};

package/src/lib/k8s/resource-detail-builder.ts

@@ -8,9 +8,9 @@ import { buildOverviewSection, buildPortForward } from "./detail-builders/overvi
 import { buildPodSections } from "./detail-builders/pod-builder";
 import { buildHpaSections, buildCronJobSections } from "./detail-builders/hpa-cronjob-builder";
 import { buildNodeSections } from "./detail-builders/node-builder";
-import { buildEventSections } from "./detail-builders/event-builder";
+import { buildEventObjectSections } from "./detail-builders/event-builder";
 import { buildRoleSections, buildRoleBindingSections, buildServiceAccountSections } from "./detail-builders/rbac-builder";
-import { flattenSections, extractContainerNames } from "./resource-parser";
+import { extractContainerNames } from "./resource-parser";
 
 export function buildResourceDetail(options: BuildResourceDetailOptions): ResourceDetail {
   const kindName = options.resource.kind ?? options.resourceKind?.name ?? "unknown";
@@ -28,7 +28,7 @@ export function buildResourceDetail(options: BuildResourceDetailOptions): Resour
   } else if (normalizedKind === "node") {
     additionalSections = buildNodeSections(options.resource);
   } else if (normalizedKind === "event" || normalizedKind === "events") {
-    additionalSections = buildEventSections(options.resource);
+    additionalSections = buildEventObjectSections(options.resource);
   } else if (normalizedKind === "role" || normalizedKind === "clusterrole") {
     additionalSections = buildRoleSections(options.resource);
   } else if (normalizedKind === "rolebinding" || normalizedKind === "clusterrolebinding") {
@@ -47,10 +47,8 @@ export function buildResourceDetail(options: BuildResourceDetailOptions): Resour
       name: options.resource.metadata?.name ?? "unknown",
       namespace: options.resource.metadata?.namespace,
     },
-    summaryLines: flattenSections(summarySections),
     summarySections,
     yaml: options.yaml,
-    describe: options.describe,
     replicas: overview.replicas,
     portForwards: portForward.length > 0 ? portForward : undefined,
     containers: containers && containers.length > 0 ? containers : undefined,
@@ -61,5 +59,4 @@ export interface BuildResourceDetailOptions {
   resourceKind?: ResourceKind | undefined;
   resource: KubernetesResource;
   yaml: string;
-  describe?: string | undefined;
 }

package/src/lib/k8s/types.ts

@@ -2,7 +2,7 @@ export type PaneId = "clusters" | "resources" | "inspector";
 
 export type OverlayId = "cluster-switcher" | "namespace-switcher" | "delete-confirm" | "port-forward" | "port-forward-list" | "logs" | "scale" | "container-picker" | "helm-rollback" | "notification-history" | "help";
 
-export type InspectorTab = "summary" | "yaml" | "events" | "describe";
+export type InspectorTab = "summary" | "yaml";
 
 export type LoadStatus = "idle" | "loading" | "ready" | "error";
 
@@ -68,14 +68,13 @@ export interface ResourceDetailSection {
 
 export interface ResourceDetail {
   ref: ResourceRef;
-  summaryLines: string[];
   summarySections: ResourceDetailSection[];
   yaml: string;
-  describe?: string | undefined;
   replicas?: number | undefined;
   portForwards?: ResourcePortForward[] | undefined;
   containers?: string[] | undefined;
   helmChart?: string | undefined;
+  helmValues?: string | undefined;
 }
 
 export interface EventItem {

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

@@ -1,5 +1,6 @@
 import { type ChildProcess } from "node:child_process";
 
+import { dump as dumpYaml } from "js-yaml";
 import { formatAge } from "../k8s/k8s-format";
 import { buildResourceDetail, type KubernetesResource } from "../k8s/resource-detail-builder";
 import type {
@@ -219,31 +220,17 @@ export class KubectlService {
     }
 
     const jsonArgs = ["--context", options.context, "get", options.resourceKind.name, options.name];
-    const yamlArgs = ["--context", options.context, "get", options.resourceKind.name, options.name];
-    const describeArgs = ["--context", options.context, "describe", options.resourceKind.name, options.name];
 
     if (options.resourceKind.namespaced) {
       jsonArgs.push("-n", options.namespace);
-      yamlArgs.push("-n", options.namespace);
-      describeArgs.push("-n", options.namespace);
     }
 
     jsonArgs.push("-o", "json");
-    yamlArgs.push("-o", "yaml");
 
-    const [resource, yaml, describeResult] = await Promise.allSettled([
-      runJson<KubernetesResource>({ command: "kubectl", args: jsonArgs, timeoutMs: KUBECTL_TIMEOUT_MS }),
-      runText({ command: "kubectl", args: yamlArgs, timeoutMs: KUBECTL_TIMEOUT_MS }),
-      runText({ command: "kubectl", args: describeArgs, timeoutMs: KUBECTL_TIMEOUT_MS }),
-    ]);
-
-    if (resource.status !== "fulfilled") {
-      throw resource.reason;
-    }
-    const yamlText = yaml.status === "fulfilled" ? yaml.value : "";
-    const describe = describeResult.status === "fulfilled" ? describeResult.value : "";
+    const resource = await runJson<KubernetesResource>({ command: "kubectl", args: jsonArgs, timeoutMs: KUBECTL_TIMEOUT_MS });
+    const yamlText = dumpYaml(resource, { lineWidth: -1, noRefs: true });
 
-    return buildResourceDetail({ resourceKind: options.resourceKind, resource: resource.value, yaml: yamlText, describe });
+    return buildResourceDetail({ resourceKind: options.resourceKind, resource, yaml: yamlText });
   }
 
   async listResourceEvents(options: ListResourceEventsOptions): Promise<EventItem[]> {
@@ -566,13 +553,15 @@ export class KubectlService {
   private async getHelmReleaseDetail(options: GetResourceDetailOptions): Promise<ResourceDetail> {
     const baseArgs = buildHelmBaseArgs(options);
 
-    const [statusResult, valuesResult] = await Promise.all([
+    const [statusResult, valuesResult, manifestResult] = await Promise.all([
       runCommand({ command: "helm", args: ["status", options.name, ...baseArgs, "-o", "json"], timeoutMs: KUBECTL_TIMEOUT_MS }),
       runCommand({ command: "helm", args: ["get", "values", options.name, ...baseArgs], timeoutMs: KUBECTL_TIMEOUT_MS }),
+      runCommand({ command: "helm", args: ["get", "manifest", options.name, ...baseArgs], timeoutMs: KUBECTL_TIMEOUT_MS }),
     ]);
 
     const status = JSON.parse(statusResult.stdout) as HelmStatusResponse;
-    const yaml = valuesResult.stdout;
+    const helmValues = valuesResult.stdout;
+    const yaml = manifestResult.stdout;
 
     const overviewLines: string[] = [
       `name: ${status.name}`,
@@ -598,23 +587,18 @@ export class KubectlService {
       ...(notesLines.length > 0 ? [{ title: "Notes", lines: notesLines }] : []),
     ];
 
-    const summaryLines = summarySections.flatMap((section) => [
-      section.title,
-      ...section.lines.map((line) => `  ${line}`),
-    ]);
-
     return {
       ref: {
         kind: "helmreleases",
         name: status.name,
         namespace: status.namespace,
       },
-      summaryLines,
       summarySections,
       yaml,
       replicas: undefined,
       portForwards: undefined,
       helmChart: status.chart.metadata.name,
+      helmValues,
     };
   }