letmecook 0.0.13 → 0.0.15

package/src/ui/session-settings.ts

@@ -2,6 +2,8 @@ import { type CliRenderer, TextRenderable, InputRenderable, type KeyEvent } from
 import { createBaseLayout, clearLayout } from "./renderer";
 import type { Session, RepoSpec } from "../types";
 import { formatRepoString } from "./common/repo-formatter";
+import { showFooter, hideFooter } from "./common/footer";
+import { isEnter, isEscape, isTab, isArrowUp, isArrowDown } from "./common/keyboard";
 
 export interface SessionSettingsResult {
   action: "saved" | "add-repos" | "add-skills" | "cancel";
@@ -140,21 +142,6 @@ export function showSessionSettings(
       skillsList.fg = "#94a3b8";
     };
 
-    const updateInstructions = () => {
-      if (selectedTarget === "goal") {
-        instructions.content = "\n[Enter] Edit goal   [s] Save   [Esc] Cancel";
-      } else if (selectedTarget === "repo") {
-        instructions.content =
-          "\n[r] Toggle read-only   [l] Toggle latest   [a] Add repos   [k] Add skills   [s] Save   [Esc] Cancel";
-      } else if (selectedTarget === "skill") {
-        instructions.content =
-          "\n[x] Remove skill   [a] Add repos   [k] Add skills   [s] Save   [Esc] Cancel";
-      } else {
-        instructions.content =
-          "\n[r] Toggle read-only   [l] Toggle latest   [a] Add repos   [k] Add skills   [s] Save   [Esc] Cancel";
-      }
-    };
-
     const updateGoalLabel = () => {
       if (selectedTarget === "goal") {
         goalLabel.content = "▶ Goal:";
@@ -191,77 +178,120 @@ export function showSessionSettings(
       }
     };
 
+    const switchToNextSection = () => {
+      if (selectedTarget === "goal") {
+        if (updatedRepos.length > 0) {
+          selectedTarget = "repo";
+          selectedRepoIndex = 0;
+        } else if (updatedSkills.length > 0) {
+          selectedTarget = "skill";
+          selectedSkillIndex = 0;
+        }
+      } else if (selectedTarget === "repo") {
+        if (updatedSkills.length > 0) {
+          selectedTarget = "skill";
+          selectedSkillIndex = 0;
+        } else {
+          selectedTarget = "goal";
+        }
+      } else if (selectedTarget === "skill") {
+        selectedTarget = "goal";
+      }
+      updateGoalLabel();
+      updateReposLabel();
+      updateSkillsLabel();
+      updateFooter();
+    };
+
+    const updateFooter = () => {
+      const customActions: string[] = [];
+      if (selectedTarget === "goal") {
+        customActions.push("Enter Edit");
+      } else if (selectedTarget === "repo") {
+        customActions.push("r Toggle RO", "l Toggle Latest", "a Add repos");
+      } else if (selectedTarget === "skill") {
+        customActions.push("x Remove", "a Add repos");
+      }
+      customActions.push("+ Add skills", "Enter Save");
+
+      hideFooter(renderer);
+      showFooter(renderer, content, {
+        navigate: true,
+        select: false,
+        back: true,
+        custom: ["Tab Switch", ...customActions],
+      });
+    };
+
     const handleKeypress = (key: KeyEvent) => {
       if (mode === "goal") {
-        if (key.name === "return" || key.name === "enter") {
+        if (isEnter(key)) {
           updatedGoal = goalInput.value.trim();
           updateMode("repos");
-        } else if (key.name === "escape") {
+          updateFooter();
+        } else if (isEscape(key)) {
           goalInput.value = updatedGoal;
           updateMode("repos");
+          updateFooter();
         }
         return;
       }
 
-      if (key.name === "escape") {
+      if (isEscape(key)) {
         cleanup();
         resolve({ action: "cancel", session });
         return;
       }
 
-      if (key.name === "up" || key.name === "k") {
+      // Tab to switch sections
+      if (isTab(key)) {
+        switchToNextSection();
+        return;
+      }
+
+      // Arrow keys for navigation within sections
+      if (isArrowUp(key)) {
         if (selectedTarget === "skill" && selectedSkillIndex > 0) {
           selectedSkillIndex = Math.max(0, selectedSkillIndex - 1);
         } else if (selectedTarget === "repo" && selectedRepoIndex > 0) {
           selectedRepoIndex = Math.max(0, selectedRepoIndex - 1);
-        } else if (selectedTarget === "repo") {
-          selectedTarget = "goal";
-        } else if (selectedTarget === "goal" && updatedSkills.length > 0) {
-          selectedTarget = "skill";
-          selectedSkillIndex = updatedSkills.length - 1;
         }
-        updateGoalLabel();
-        updateReposLabel();
-        updateSkillsLabel();
-        updateInstructions();
         updateReposList();
         updateSkillsList();
         return;
       }
 
-      if (key.name === "down" || key.name === "j") {
-        if (selectedTarget === "goal") {
-          if (updatedRepos.length > 0) {
-            selectedTarget = "repo";
-            selectedRepoIndex = 0;
-          } else if (updatedSkills.length > 0) {
-            selectedTarget = "skill";
-            selectedSkillIndex = 0;
-          }
-        } else if (selectedTarget === "repo") {
-          if (selectedRepoIndex < updatedRepos.length - 1) {
-            selectedRepoIndex = Math.min(updatedRepos.length - 1, selectedRepoIndex + 1);
-          } else if (updatedSkills.length > 0) {
-            selectedTarget = "skill";
-            selectedSkillIndex = 0;
-          }
-        } else if (selectedTarget === "skill") {
+      if (isArrowDown(key)) {
+        if (selectedTarget === "repo" && selectedRepoIndex < updatedRepos.length - 1) {
+          selectedRepoIndex = Math.min(updatedRepos.length - 1, selectedRepoIndex + 1);
+        } else if (selectedTarget === "skill" && selectedSkillIndex < updatedSkills.length - 1) {
           selectedSkillIndex = Math.min(updatedSkills.length - 1, selectedSkillIndex + 1);
         }
-        updateGoalLabel();
-        updateReposLabel();
-        updateSkillsLabel();
-        updateInstructions();
         updateReposList();
         updateSkillsList();
         return;
       }
 
-      if ((key.name === "return" || key.name === "enter") && selectedTarget === "goal") {
-        updateMode("goal");
+      // Enter to edit goal or save
+      if (isEnter(key)) {
+        if (selectedTarget === "goal") {
+          updateMode("goal");
+        } else {
+          // Save changes
+          updatedGoal = goalInput.value.trim();
+          const updatedSession: Session = {
+            ...session,
+            repos: updatedRepos,
+            skills: updatedSkills.length > 0 ? updatedSkills : undefined,
+            goal: updatedGoal || undefined,
+          };
+          cleanup();
+          resolve({ action: "saved", session: updatedSession });
+        }
         return;
       }
 
+      // Hotkeys
       if (key.name === "a") {
         updatedGoal = goalInput.value.trim();
         const updatedSession: Session = {
@@ -275,7 +305,8 @@ export function showSessionSettings(
         return;
       }
 
-      if (key.name === "k") {
+      if (key.name === "+" || key.name === "=") {
+        // + or = for add skills
         updatedGoal = goalInput.value.trim();
         const updatedSession: Session = {
           ...session,
@@ -297,18 +328,18 @@ export function showSessionSettings(
           }
           if (updatedSkills.length === 0) {
             selectedTarget = updatedRepos.length > 0 ? "repo" : "goal";
+            updateGoalLabel();
+            updateReposLabel();
+            updateSkillsLabel();
+            updateFooter();
           }
-          updateGoalLabel();
-          updateReposLabel();
-          updateSkillsLabel();
-          updateInstructions();
           updateReposList();
           updateSkillsList();
         }
         return;
       }
 
-      if (key.name === "r") {
+      if (key.name === "r" && selectedTarget === "repo") {
         const repo = updatedRepos[selectedRepoIndex];
         if (repo) {
           repo.readOnly = !repo.readOnly;
@@ -320,7 +351,7 @@ export function showSessionSettings(
         return;
       }
 
-      if (key.name === "l") {
+      if (key.name === "l" && selectedTarget === "repo") {
         const repo = updatedRepos[selectedRepoIndex];
         if (repo) {
           repo.latest = !repo.latest;
@@ -331,33 +362,22 @@ export function showSessionSettings(
         }
         return;
       }
-
-      if (key.name === "s") {
-        updatedGoal = goalInput.value.trim();
-        const updatedSession: Session = {
-          ...session,
-          repos: updatedRepos,
-          skills: updatedSkills.length > 0 ? updatedSkills : undefined,
-          goal: updatedGoal || undefined,
-        };
-        cleanup();
-        resolve({ action: "saved", session: updatedSession });
-      }
     };
 
     const cleanup = () => {
       renderer.keyInput.off("keypress", handleKeypress);
       goalInput.blur();
+      hideFooter(renderer);
       clearLayout(renderer);
     };
 
     updateGoalLabel();
     updateReposLabel();
     updateSkillsLabel();
-    updateInstructions();
     updateReposList();
     updateSkillsList();
     updateMode("repos");
+    updateFooter();
     renderer.keyInput.on("keypress", handleKeypress);
   });
 }

package/src/ui/skills.ts

@@ -1,12 +1,7 @@
-import {
-  type CliRenderer,
-  TextRenderable,
-  InputRenderable,
-  SelectRenderable,
-  SelectRenderableEvents,
-  type KeyEvent,
-} from "@opentui/core";
+import { type CliRenderer, TextRenderable, InputRenderable, type KeyEvent } from "@opentui/core";
 import { createBaseLayout, clearLayout } from "./renderer";
+import { showFooter, hideFooter } from "./common/footer";
+import { isEnter, isEscape } from "./common/keyboard";
 
 export interface SkillsPromptResult {
   skills: string[];
@@ -44,93 +39,56 @@ export async function showSkillsPrompt(
     });
     content.add(input);
 
-    const existingSkillsText = new TextRenderable(renderer, {
-      id: "existing-skills",
-      content: "",
-      fg: "#94a3b8",
+    const skillsLabel = new TextRenderable(renderer, {
+      id: "skills-label",
+      content: "\nAdded skills:",
+      fg: "#e2e8f0",
       marginTop: 1,
       marginBottom: 0,
     });
-    content.add(existingSkillsText);
+    content.add(skillsLabel);
 
-    const confirmation = new SelectRenderable(renderer, {
-      id: "confirmation-select",
-      width: 40,
-      height: 1,
-      options: [
-        { name: "Add another skill", description: "", value: "yes" },
-        { name: "Done adding skills", description: "", value: "no" },
-      ],
-      showDescription: false,
-      backgroundColor: "transparent",
-      focusedBackgroundColor: "transparent",
-      selectedBackgroundColor: "#334155",
-      textColor: "#e2e8f0",
-      selectedTextColor: "#38bdf8",
-      descriptionColor: "#64748b",
-      selectedDescriptionColor: "#94a3b8",
+    const existingSkillsText = new TextRenderable(renderer, {
+      id: "existing-skills",
+      content: "(none)",
+      fg: "#64748b",
       marginTop: 1,
+      marginBottom: 0,
     });
-    content.add(confirmation);
+    content.add(existingSkillsText);
 
-    const instructions = new TextRenderable(renderer, {
-      id: "instructions",
-      content: "\n[Enter] Add skill   [Ctrl+D] Done   [Esc] Cancel",
-      fg: "#64748b",
-      marginTop: 1,
+    const skillsCounter = new TextRenderable(renderer, {
+      id: "skills-counter",
+      content: "",
+      fg: "#94a3b8",
+      marginTop: 0,
     });
-    content.add(instructions);
+    content.add(skillsCounter);
 
     const skills: string[] = [];
-    let showingConfirmation = false;
 
     const updateExistingSkills = () => {
       if (skills.length === 0) {
-        existingSkillsText.content = "";
+        existingSkillsText.content = "(none)";
+        existingSkillsText.fg = "#64748b";
+        skillsCounter.content = "";
       } else {
         const text = skills.map((skill) => `  ✓ ${skill}`).join("\n");
-        existingSkillsText.content = `Added skills:\n${text}`;
+        existingSkillsText.content = text;
+        existingSkillsText.fg = "#94a3b8";
+        skillsCounter.content = `Added: ${skills.length} ${skills.length === 1 ? "skill" : "skills"}`;
       }
     };
 
     const cleanup = () => {
       renderer.keyInput.off("keypress", handleKeypress);
       input.blur();
-      confirmation.off(SelectRenderableEvents.ITEM_SELECTED, handleConfirm);
-      confirmation.blur();
+      hideFooter(renderer);
       clearLayout(renderer);
     };
 
     const handleKeypress = (key: KeyEvent) => {
-      if (showingConfirmation) {
-        if (key.name === "return" || key.name === "enter") {
-          cleanup();
-          resolve({
-            skills,
-            cancelled: false,
-          });
-          return;
-        }
-        if (key.name === "escape") {
-          cleanup();
-          resolve({
-            skills,
-            cancelled: false,
-          });
-          return;
-        }
-        if (key.name === "d" && key.ctrl) {
-          cleanup();
-          resolve({
-            skills,
-            cancelled: false,
-          });
-          return;
-        }
-        return;
-      }
-
-      if (key.name === "escape") {
+      if (isEscape(key)) {
         cleanup();
         resolve({
           skills: [],
@@ -139,47 +97,33 @@ export async function showSkillsPrompt(
         return;
       }
 
-      if (key.name === "d" && key.ctrl) {
-        cleanup();
-        resolve({
-          skills,
-          cancelled: false,
-        });
-        return;
-      }
-
-      if (key.name === "return" || key.name === "enter") {
+      if (isEnter(key)) {
         const skill = input.value.trim();
         if (skill) {
+          // Add skill
           skills.push(skill);
           updateExistingSkills();
           input.value = "";
-          showingConfirmation = true;
-          confirmation.focus();
-          instructions.content = "\n[Enter] Add another   [Ctrl+D] Done   [Esc] Cancel";
+        } else {
+          // Empty input = done (with or without skills)
+          cleanup();
+          resolve({
+            skills,
+            cancelled: false,
+          });
         }
-      }
-    };
-
-    const handleConfirm = (_index: number, option: { value: string }) => {
-      if (option.value === "yes") {
-        showingConfirmation = false;
-        input.focus();
-        instructions.content = "\n[Enter] Add skill   [Esc] Cancel";
         return;
       }
-
-      cleanup();
-      resolve({
-        skills,
-        cancelled: false,
-      });
     };
 
     input.focus();
-    confirmation.off(SelectRenderableEvents.ITEM_SELECTED, handleConfirm);
-    renderer.keyInput.off("keypress", handleKeypress);
+    showFooter(renderer, content, {
+      navigate: false,
+      select: true,
+      back: true,
+      custom: ["Enter Add/Done"],
+    });
     renderer.keyInput.on("keypress", handleKeypress);
-    confirmation.on(SelectRenderableEvents.ITEM_SELECTED, handleConfirm);
+    updateExistingSkills();
   });
 }