clairo 1.0.8 → 1.0.9

package/dist/cli.js

@@ -573,6 +573,26 @@ function extractTicketKey(text) {
 }
 
 // src/lib/jira/config.ts
+function getExistingJiraConfigs(excludeRepoPath) {
+  const config = loadConfig();
+  const repos = config.repositories ?? {};
+  const configs = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const [repoPath, repoConfig] of Object.entries(repos)) {
+    if (repoPath === excludeRepoPath) continue;
+    if (!repoConfig.jiraSiteUrl || !repoConfig.jiraEmail || !repoConfig.jiraApiToken) continue;
+    const key = `${repoConfig.jiraSiteUrl}|${repoConfig.jiraEmail}`;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    configs.push({
+      repoPath,
+      siteUrl: repoConfig.jiraSiteUrl,
+      email: repoConfig.jiraEmail,
+      apiToken: repoConfig.jiraApiToken
+    });
+  }
+  return configs;
+}
 function isJiraConfigured(repoPath) {
   const config = getRepoConfig(repoPath);
   return !!(config.jiraSiteUrl && config.jiraEmail && config.jiraApiToken);
@@ -594,6 +614,13 @@ function getJiraCredentials(repoPath) {
 function setJiraCredentials(repoPath, email, apiToken) {
   updateRepoConfig(repoPath, { jiraEmail: email, jiraApiToken: apiToken });
 }
+function clearJiraConfig(repoPath) {
+  updateRepoConfig(repoPath, {
+    jiraSiteUrl: void 0,
+    jiraEmail: void 0,
+    jiraApiToken: void 0
+  });
+}
 function getLinkedTickets(repoPath, branch) {
   var _a;
   const config = getRepoConfig(repoPath);
@@ -2035,6 +2062,7 @@ function ChangeStatusModal({ repoPath, ticketKey, currentStatus, onComplete, onC
 // src/components/jira/ConfigureJiraSiteModal.tsx
 import { useState as useState15 } from "react";
 import { Box as Box9, Text as Text9, useInput as useInput8 } from "ink";
+import { ScrollView as ScrollView4 } from "ink-scroll-view";
 
 // src/lib/editor.ts
 import { spawnSync as spawnSync2 } from "child_process";
@@ -2066,27 +2094,57 @@ function openInEditor(content, filename) {
 
 // src/components/jira/ConfigureJiraSiteModal.tsx
 import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+var MAX_VISIBLE_ITEMS = 4;
 function ConfigureJiraSiteModal({
   initialSiteUrl,
   initialEmail,
+  existingConfigs = [],
   onSubmit,
   onCancel,
   loading,
   error
 }) {
+  const hasExisting = existingConfigs.length > 0;
+  const [mode, setMode] = useState15(hasExisting ? "choose" : "manual");
+  const [selectedExisting, setSelectedExisting] = useState15(0);
+  const scrollRef = useScrollToIndex(selectedExisting);
   const [siteUrl, setSiteUrl] = useState15(initialSiteUrl ?? "");
   const [email, setEmail] = useState15(initialEmail ?? "");
   const [apiToken, setApiToken] = useState15("");
   const [selectedItem, setSelectedItem] = useState15("siteUrl");
   const items = ["siteUrl", "email", "apiToken", "submit"];
   const canSubmit = siteUrl.trim() && email.trim() && apiToken.trim();
+  const chooseItems = existingConfigs.length + 1;
   useInput8(
     (input, key) => {
       if (loading) return;
       if (key.escape) {
+        if (mode === "manual" && hasExisting) {
+          setMode("choose");
+          return;
+        }
         onCancel();
         return;
       }
+      if (mode === "choose") {
+        if (key.upArrow || input === "k") {
+          setSelectedExisting((prev) => Math.max(0, prev - 1));
+          return;
+        }
+        if (key.downArrow || input === "j") {
+          setSelectedExisting((prev) => Math.min(chooseItems - 1, prev + 1));
+          return;
+        }
+        if (key.return) {
+          if (selectedExisting < existingConfigs.length) {
+            const config = existingConfigs[selectedExisting];
+            onSubmit(config.siteUrl, config.email, config.apiToken);
+          } else {
+            setMode("manual");
+          }
+        }
+        return;
+      }
       if (key.upArrow || input === "k") {
         setSelectedItem((prev) => {
           const idx = items.indexOf(prev);
@@ -2137,9 +2195,49 @@ function ConfigureJiraSiteModal({
       value !== void 0 && /* @__PURE__ */ jsx9(Box9, { marginLeft: 4, children: /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: displayValue || "(empty - press Enter to edit)" }) })
     ] });
   };
+  if (mode === "choose") {
+    const totalItems = existingConfigs.length + 1;
+    const listHeight = Math.min(totalItems * 2, MAX_VISIBLE_ITEMS * 2);
+    return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, paddingY: 1, children: [
+      /* @__PURE__ */ jsx9(Text9, { bold: true, color: "cyan", children: "Configure Jira Site" }),
+      /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "Select an existing configuration or enter new credentials" }),
+      /* @__PURE__ */ jsx9(Box9, { marginTop: 1 }),
+      error && /* @__PURE__ */ jsx9(Box9, { marginBottom: 1, children: /* @__PURE__ */ jsx9(Text9, { color: "red", children: error }) }),
+      /* @__PURE__ */ jsx9(Box9, { height: listHeight, overflow: "hidden", children: /* @__PURE__ */ jsxs9(ScrollView4, { ref: scrollRef, children: [
+        existingConfigs.map((config, idx) => {
+          const isSelected = selectedExisting === idx;
+          return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
+            /* @__PURE__ */ jsxs9(Text9, { color: isSelected ? "yellow" : void 0, bold: isSelected, children: [
+              isSelected ? "> " : "  ",
+              config.siteUrl
+            ] }),
+            /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
+              "    ",
+              config.email
+            ] })
+          ] }, config.siteUrl + config.email);
+        }),
+        /* @__PURE__ */ jsx9(Box9, { children: /* @__PURE__ */ jsxs9(
+          Text9,
+          {
+            color: selectedExisting === existingConfigs.length ? "yellow" : void 0,
+            bold: selectedExisting === existingConfigs.length,
+            children: [
+              selectedExisting === existingConfigs.length ? "> " : "  ",
+              "Enter new credentials..."
+            ]
+          }
+        ) })
+      ] }) }),
+      loading && /* @__PURE__ */ jsx9(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "Validating credentials..." }) })
+    ] });
+  }
   return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, paddingY: 1, children: [
     /* @__PURE__ */ jsx9(Text9, { bold: true, color: "cyan", children: "Configure Jira Site" }),
-    /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "Up/Down to select, Enter to edit, Esc to cancel" }),
+    /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
+      "Up/Down to select, Enter to edit, Esc to ",
+      hasExisting ? "go back" : "cancel"
+    ] }),
     /* @__PURE__ */ jsx9(Box9, { marginTop: 1 }),
     error && /* @__PURE__ */ jsx9(Box9, { marginBottom: 1, children: /* @__PURE__ */ jsx9(Text9, { color: "red", children: error }) }),
     renderItem("siteUrl", "Site URL (e.g., https://company.atlassian.net)", siteUrl),
@@ -2251,6 +2349,11 @@ function JiraView({ isFocused, onModalChange, onJiraStateChange, onLogUpdated })
     modal.close();
     jira.refreshTickets(repo.repoPath, repo.currentBranch);
   };
+  const handleRemoveConfig = () => {
+    if (!repo.repoPath || !repo.currentBranch) return;
+    clearJiraConfig(repo.repoPath);
+    jira.initializeJiraState(repo.repoPath, repo.currentBranch, repo.currentRepoSlug);
+  };
   useInput9(
     (input, key) => {
       if (input === "c" && jira.jiraState === "not_configured") {
@@ -2261,6 +2364,10 @@ function JiraView({ isFocused, onModalChange, onJiraStateChange, onLogUpdated })
         modal.open("link");
         return;
       }
+      if (input === "r" && jira.jiraState !== "not_configured") {
+        handleRemoveConfig();
+        return;
+      }
       if (jira.jiraState === "has_tickets") {
         if (key.upArrow || input === "k") nav.prev();
         if (key.downArrow || input === "j") nav.next();
@@ -2278,11 +2385,13 @@ function JiraView({ isFocused, onModalChange, onJiraStateChange, onLogUpdated })
   if (modal.type === "configure") {
     const siteUrl = repo.repoPath ? getJiraSiteUrl(repo.repoPath) : void 0;
     const creds = repo.repoPath ? getJiraCredentials(repo.repoPath) : { email: null, apiToken: null };
+    const existingConfigs = getExistingJiraConfigs(repo.repoPath ?? void 0);
     return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", flexShrink: 0, children: /* @__PURE__ */ jsx11(
       ConfigureJiraSiteModal,
       {
         initialSiteUrl: siteUrl ?? void 0,
         initialEmail: creds.email ?? void 0,
+        existingConfigs,
         onSubmit: handleConfigureSubmit,
         onCancel: () => {
           modal.close();
@@ -2346,7 +2455,7 @@ import { Box as Box14, useInput as useInput12 } from "ink";
 import { useRef as useRef7, useState as useState16 } from "react";
 import { TitledBox as TitledBox5 } from "@mishieck/ink-titled-box";
 import { Box as Box12, Text as Text12, useInput as useInput10 } from "ink";
-import { ScrollView as ScrollView4 } from "ink-scroll-view";
+import { ScrollView as ScrollView5 } from "ink-scroll-view";
 import TextInput2 from "ink-text-input";
 
 // src/lib/claude/api.ts
@@ -2524,7 +2633,7 @@ ${value.trim()}
     onRefresh();
   };
   return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", flexGrow: 1, children: [
-    /* @__PURE__ */ jsx12(TitledBox5, { borderStyle: "round", titles: [displayTitle], borderColor, flexGrow: 1, children: /* @__PURE__ */ jsx12(Box12, { flexDirection: "column", flexGrow: 1, children: /* @__PURE__ */ jsx12(ScrollView4, { ref: scrollRef, children: /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", paddingX: 1, children: [
+    /* @__PURE__ */ jsx12(TitledBox5, { borderStyle: "round", titles: [displayTitle], borderColor, flexGrow: 1, children: /* @__PURE__ */ jsx12(Box12, { flexDirection: "column", flexGrow: 1, children: /* @__PURE__ */ jsx12(ScrollView5, { ref: scrollRef, children: /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", paddingX: 1, children: [
       !date && /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: "Select a log file to view" }),
       date && content === null && /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: "Log file not found" }),
       date && content !== null && content.trim() === "" && /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: "Empty log file" }),
@@ -2560,7 +2669,7 @@ ${value.trim()}
 // src/components/logs/LogsHistoryBox.tsx
 import { TitledBox as TitledBox6 } from "@mishieck/ink-titled-box";
 import { Box as Box13, Text as Text13, useInput as useInput11 } from "ink";
-import { ScrollView as ScrollView5 } from "ink-scroll-view";
+import { ScrollView as ScrollView6 } from "ink-scroll-view";
 import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
 function LogsHistoryBox({
   logFiles,
@@ -2593,7 +2702,7 @@ function LogsHistoryBox({
   );
   return /* @__PURE__ */ jsx13(TitledBox6, { borderStyle: "round", titles: [title], borderColor, height: 5, children: /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", paddingX: 1, flexGrow: 1, overflow: "hidden", children: [
     logFiles.length === 0 && /* @__PURE__ */ jsx13(Text13, { dimColor: true, children: "No logs yet" }),
-    logFiles.length > 0 && /* @__PURE__ */ jsx13(ScrollView5, { ref: scrollRef, children: logFiles.map((file, idx) => {
+    logFiles.length > 0 && /* @__PURE__ */ jsx13(ScrollView6, { ref: scrollRef, children: logFiles.map((file, idx) => {
       const isHighlighted = idx === highlightedIndex;
       const isSelected = file.date === selectedDate;
       const cursor = isHighlighted ? ">" : " ";
@@ -2695,13 +2804,17 @@ var GITHUB_KEYBINDINGS = {
 // src/constants/jira.ts
 var JIRA_KEYBINDINGS = {
   not_configured: [{ key: "c", label: "Configure Jira" }],
-  no_tickets: [{ key: "l", label: "Link Ticket" }],
+  no_tickets: [
+    { key: "l", label: "Link Ticket" },
+    { key: "r", label: "Remove Config", color: "red" }
+  ],
   has_tickets: [
     { key: "l", label: "Link" },
     { key: "s", label: "Status" },
     { key: "d", label: "Unlink", color: "red" },
     { key: "o", label: "Open", color: "green" },
-    { key: "y", label: "Copy Link" }
+    { key: "y", label: "Copy Link" },
+    { key: "r", label: "Remove Config", color: "red" }
   ]
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clairo",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "license": "MIT",
   "repository": {
     "type": "git",