open-nami 1.2.4 → 1.2.6

package/dist/cli.js

@@ -9,7 +9,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "open-nami",
-      version: "1.2.4",
+      version: "1.2.6",
       description: "Open Nami: terminal-first bulk social media profile downloader for Instagram, TikTok, Facebook & X.",
       type: "module",
       bin: {
@@ -77,7 +77,7 @@ import { createRequire } from "module";
 import { render } from "ink";
 
 // src/app.tsx
-import { useState as useState9, useCallback as useCallback5, useRef as useRef5, useEffect as useEffect7, useMemo as useMemo3 } from "react";
+import { useState as useState9, useCallback as useCallback5, useRef as useRef5, useEffect as useEffect8, useMemo as useMemo3 } from "react";
 import { Box as Box15, Text as Text17, useApp, useInput as useInput6, useStdout as useStdout3 } from "ink";
 import Spinner4 from "ink-spinner";
 
@@ -5629,7 +5629,7 @@ function WatcherView({
 }
 
 // src/components/views/batch-view.tsx
-import { useState as useState8, useRef as useRef4, useCallback as useCallback4 } from "react";
+import { useState as useState8, useRef as useRef4, useCallback as useCallback4, useEffect as useEffect7 } from "react";
 import { Box as Box14, Text as Text16, useInput as useInput5 } from "ink";
 import Spinner3 from "ink-spinner";
 import fs13 from "fs";
@@ -5667,13 +5667,19 @@ async function runBatchQueue(options) {
   const choice = options.choice || "all";
   const minDelay = options.minDelayMs ?? 2e3;
   const maxDelay = options.maxDelayMs ?? 5e3;
-  const items = rawEntries.map((raw) => ({
-    raw,
-    profile: parseProfileInput(raw),
-    status: "pending",
-    downloaded: 0,
-    skipped: 0
-  }));
+  const items = rawEntries.map((raw) => {
+    let profile = parseProfileInput(raw);
+    if (options.defaultPlatform && profile.platform === "unknown" && profile.username) {
+      profile = buildCanonicalProfile(options.defaultPlatform, profile.username, raw);
+    }
+    return {
+      raw,
+      profile,
+      status: "pending",
+      downloaded: 0,
+      skipped: 0
+    };
+  });
   let totalDownloaded = 0;
   let totalSkipped = 0;
   let succeeded = 0;
@@ -5693,10 +5699,15 @@ async function runBatchQueue(options) {
     }
     options.onAccountStart?.(item, i, items.length);
     try {
+      const targetDir = resolveDefaultDownloadDir(
+        item.profile.platform,
+        item.profile.username,
+        options.outputDir
+      );
       const res = await dispatchDownload({
         profile: item.profile,
         choice,
-        outputDir: options.outputDir,
+        outputDir: targetDir,
         since: options.since,
         until: options.until,
         limit: options.limit,
@@ -5744,6 +5755,8 @@ async function runBatchQueue(options) {
 
 // src/components/views/batch-view.tsx
 import { Fragment as Fragment4, jsx as jsx17, jsxs as jsxs14 } from "react/jsx-runtime";
+var PLATFORMS = ["instagram", "tiktok", "facebook", "x"];
+var CHOICES = ["all", "photos", "videos", "stories", "highlights"];
 var DATE_PRESETS2 = ["all", "24h", "7d", "30d", "2024", "2023", "2022", "2021", "custom"];
 var LIMIT_PRESETS2 = [void 0, 10, 24, 50, 100, "custom"];
 function BatchView({
@@ -5754,16 +5767,18 @@ function BatchView({
   gapComponent: Gap2,
   defaultChoice = "all",
   defaultLimit,
-  defaultWriteMetadata = false
+  defaultWriteMetadata = false,
+  onRegisterClickTargets
 }) {
   const [phase, setPhase] = useState8("input");
   const [inputField, setInputField] = useState8("text");
   const [rawText, setRawText] = useState8("");
   const [filePath, setFilePath] = useState8("");
   const [errorMessage, setErrorMessage] = useState8(null);
-  const [focusSection, setFocusSection] = useState8("input");
+  const [focusedControl, setFocusedControl] = useState8("input");
   const [customLimitText, setCustomLimitText] = useState8("");
   const [customDateText, setCustomDateText] = useState8("");
+  const [defaultPlatform, setDefaultPlatform] = useState8("instagram");
   const [choice, setChoice] = useState8(defaultChoice);
   const [limit, setLimit] = useState8(defaultLimit);
   const [dateFilter, setDateFilter] = useState8("all");
@@ -5775,11 +5790,16 @@ function BatchView({
   const [isCooldown, setIsCooldown] = useState8(false);
   const [result, setResult] = useState8(null);
   const abortControllerRef = useRef4(null);
+  const cyclePlatform = useCallback4(() => {
+    setDefaultPlatform((prev) => {
+      const idx = PLATFORMS.indexOf(prev);
+      return PLATFORMS[(idx + 1) % PLATFORMS.length];
+    });
+  }, []);
   const cycleChoice = useCallback4(() => {
     setChoice((prev) => {
-      if (prev === "all") return "photos";
-      if (prev === "photos") return "videos";
-      return "all";
+      const idx = CHOICES.indexOf(prev);
+      return CHOICES[(idx + 1) % CHOICES.length];
     });
   }, []);
   const cycleLimit = useCallback4(() => {
@@ -5788,7 +5808,7 @@ function BatchView({
     const nextVal = LIMIT_PRESETS2[nextIdx];
     if (nextVal === "custom") {
       setCustomLimitText(limit ? String(limit) : "24");
-      setFocusSection("custom-limit");
+      setFocusedControl("custom-limit");
     } else {
       setLimit(nextVal);
     }
@@ -5798,8 +5818,8 @@ function BatchView({
     const nextIdx = (curIdx + 1) % DATE_PRESETS2.length;
     const nextVal = DATE_PRESETS2[nextIdx];
     if (nextVal === "custom") {
-      setCustomDateText(dateFilter !== "all" ? dateFilter : "2021");
-      setFocusSection("custom-date");
+      setCustomDateText(dateFilter !== "all" ? dateFilter : "2024");
+      setFocusedControl("custom-date");
     } else {
       setDateFilter(nextVal);
     }
@@ -5824,7 +5844,11 @@ function BatchView({
         return;
       }
     } else {
-      lines = rawText.split(/[\n,;]+/).map((s) => s.trim()).filter(Boolean);
+      lines = Array.from(
+        new Set(
+          rawText.split(/[\r\n,;\s]+/).map((s) => s.trim()).filter(Boolean)
+        )
+      );
       if (lines.length === 0) {
         setErrorMessage("Please enter at least one profile URL or username");
         return;
@@ -5839,6 +5863,7 @@ function BatchView({
         filePath: inputField === "file" ? filePath.trim() : void 0,
         lines: inputField === "text" ? lines : void 0,
         choice,
+        defaultPlatform,
         outputDir,
         since: dateRange.since,
         until: dateRange.until,
@@ -5849,7 +5874,7 @@ function BatchView({
         onAccountStart: (item, idx) => {
           setIsCooldown(false);
           setCurrentIndex(idx);
-          setCurrentProgressText(`Probing @${item.profile.username || item.raw}\u2026`);
+          setCurrentProgressText(`Probing @${item.profile.username || item.raw} on ${item.profile.platform}\u2026`);
           setQueueItems((prev) => {
             const next = [...prev];
             if (next[idx]) next[idx] = { ...item };
@@ -5891,15 +5916,18 @@ function BatchView({
       setErrorMessage(msg);
       setPhase("input");
     }
-  }, [inputField, filePath, rawText, choice, outputDir, dateFilter, limit, resume, writeMetadata]);
+  }, [inputField, filePath, rawText, choice, defaultPlatform, outputDir, dateFilter, limit, resume, writeMetadata]);
   useInput5((input, key) => {
+    if (key.ctrl && (input === "c" || input === "C")) {
+      return;
+    }
     if (key.escape) {
-      if (focusSection === "custom-limit" || focusSection === "custom-date") {
-        setFocusSection("options");
+      if (focusedControl === "custom-limit" || focusedControl === "custom-date") {
+        setFocusedControl("start");
         return;
       }
-      if (focusSection === "options") {
-        setFocusSection("input");
+      if (focusedControl !== "input" && phase === "input") {
+        setFocusedControl("input");
         return;
       }
       if (phase === "running") {
@@ -5922,107 +5950,471 @@ function BatchView({
       }
       return;
     }
+    if (phase === "running") {
+      return;
+    }
     if (phase === "input") {
-      if (focusSection === "custom-limit" || focusSection === "custom-date") {
+      if (focusedControl === "custom-limit" || focusedControl === "custom-date") {
         return;
       }
-      if (key.ctrl) {
-        if (input === "l" || input === "L") {
-          setCustomLimitText(limit ? String(limit) : "24");
-          setFocusSection("custom-limit");
+      if (focusedControl === "input") {
+        if (key.downArrow) {
+          setFocusedControl("platform");
           return;
         }
-        if (input === "d" || input === "D") {
-          setCustomDateText(dateFilter !== "all" ? dateFilter : "2021");
-          setFocusSection("custom-date");
+        if (key.upArrow) {
+          setFocusedControl("tabs");
           return;
         }
-        if (input === "c" || input === "C") {
-          cycleChoice();
+        return;
+      }
+      if (focusedControl === "tabs") {
+        if (key.leftArrow || key.rightArrow || input === " " || key.return) {
+          setInputField((prev) => prev === "text" ? "file" : "text");
           return;
         }
-        if (input === "m" || input === "M") {
-          toggleMetadata();
+        if (key.downArrow || key.tab) {
+          setFocusedControl("input");
           return;
         }
-        if (input === "r" || input === "R") {
-          toggleResume();
+        return;
+      }
+      if (focusedControl === "platform") {
+        if (key.rightArrow) {
+          setFocusedControl("choice");
           return;
         }
-      }
-      if (focusSection === "input") {
         if (key.downArrow) {
-          setFocusSection("options");
+          setFocusedControl("limit");
           return;
         }
-      } else if (focusSection === "options") {
         if (key.upArrow) {
-          setFocusSection("input");
+          setFocusedControl("input");
           return;
         }
-        if (key.return) {
-          startQueue();
+        if (key.tab && !key.shift) {
+          setFocusedControl("choice");
           return;
         }
-        if (input === "c" || input === "C") {
-          cycleChoice();
+        if (key.tab && key.shift) {
+          setFocusedControl("input");
           return;
         }
-        if (input === "l" || input === "L") {
-          cycleLimit();
+      } else if (focusedControl === "choice") {
+        if (key.leftArrow) {
+          setFocusedControl("platform");
           return;
         }
-        if (input === "d" || input === "D") {
-          cycleDate();
+        if (key.downArrow) {
+          setFocusedControl("date");
           return;
         }
-        if (input === "m" || input === "M") {
-          toggleMetadata();
+        if (key.upArrow) {
+          setFocusedControl("input");
           return;
         }
-        if (input === "r" || input === "R") {
-          toggleResume();
+        if (key.tab && !key.shift) {
+          setFocusedControl("limit");
+          return;
+        }
+        if (key.tab && key.shift) {
+          setFocusedControl("platform");
+          return;
+        }
+      } else if (focusedControl === "limit") {
+        if (key.upArrow) {
+          setFocusedControl("platform");
+          return;
+        }
+        if (key.rightArrow) {
+          setFocusedControl("date");
+          return;
+        }
+        if (key.downArrow) {
+          setFocusedControl("meta");
+          return;
+        }
+        if (key.tab && !key.shift) {
+          setFocusedControl("date");
+          return;
+        }
+        if (key.tab && key.shift) {
+          setFocusedControl("choice");
+          return;
+        }
+      } else if (focusedControl === "date") {
+        if (key.upArrow) {
+          setFocusedControl("choice");
+          return;
+        }
+        if (key.leftArrow) {
+          setFocusedControl("limit");
+          return;
+        }
+        if (key.downArrow) {
+          setFocusedControl("resume");
+          return;
+        }
+        if (key.tab && !key.shift) {
+          setFocusedControl("meta");
+          return;
+        }
+        if (key.tab && key.shift) {
+          setFocusedControl("limit");
+          return;
+        }
+      } else if (focusedControl === "meta") {
+        if (key.upArrow) {
+          setFocusedControl("limit");
+          return;
+        }
+        if (key.rightArrow) {
+          setFocusedControl("resume");
+          return;
+        }
+        if (key.downArrow) {
+          setFocusedControl("start");
+          return;
+        }
+        if (key.tab && !key.shift) {
+          setFocusedControl("resume");
+          return;
+        }
+        if (key.tab && key.shift) {
+          setFocusedControl("date");
+          return;
+        }
+      } else if (focusedControl === "resume") {
+        if (key.upArrow) {
+          setFocusedControl("date");
+          return;
+        }
+        if (key.leftArrow) {
+          setFocusedControl("meta");
+          return;
+        }
+        if (key.downArrow) {
+          setFocusedControl("start");
+          return;
+        }
+        if (key.tab && !key.shift) {
+          setFocusedControl("start");
+          return;
+        }
+        if (key.tab && key.shift) {
+          setFocusedControl("meta");
+          return;
+        }
+      } else if (focusedControl === "start") {
+        if (key.upArrow) {
+          setFocusedControl("meta");
+          return;
+        }
+        if (key.downArrow || key.tab && !key.shift) {
+          setFocusedControl("tabs");
+          return;
+        }
+        if (key.tab && key.shift) {
+          setFocusedControl("resume");
           return;
         }
       }
+      if (input === " " || key.return) {
+        switch (focusedControl) {
+          case "platform":
+            cyclePlatform();
+            break;
+          case "choice":
+            cycleChoice();
+            break;
+          case "limit":
+            cycleLimit();
+            break;
+          case "date":
+            cycleDate();
+            break;
+          case "meta":
+            toggleMetadata();
+            break;
+          case "resume":
+            toggleResume();
+            break;
+          case "start":
+            startQueue();
+            break;
+        }
+        return;
+      }
+      if (input === "p" || input === "P") {
+        cyclePlatform();
+        return;
+      }
+      if (input === "c" || input === "C") {
+        cycleChoice();
+        return;
+      }
+      if (input === "l" || input === "L") {
+        cycleLimit();
+        return;
+      }
+      if (input === "d" || input === "D") {
+        cycleDate();
+        return;
+      }
+      if (input === "m" || input === "M") {
+        toggleMetadata();
+        return;
+      }
+      if (input === "r" || input === "R") {
+        toggleResume();
+        return;
+      }
     }
   }, { isActive: Boolean(process.stdin.isTTY) });
+  useEffect7(() => {
+    if (!onRegisterClickTargets) return;
+    const targets = [];
+    if (phase === "input") {
+      targets.push({
+        match: "Links / Handles",
+        padX: 2,
+        padY: 0,
+        action: () => {
+          setInputField("text");
+          setFocusedControl("input");
+        }
+      });
+      targets.push({
+        match: "File (.txt)",
+        padX: 2,
+        padY: 0,
+        action: () => {
+          setInputField("file");
+          setFocusedControl("input");
+        }
+      });
+      targets.push({
+        match: "download",
+        padX: 2,
+        padY: 1,
+        action: startQueue
+      });
+      targets.push({
+        match: "Platform:",
+        padX: 2,
+        padY: 0,
+        action: () => {
+          setFocusedControl("platform");
+          cyclePlatform();
+        }
+      });
+      targets.push({
+        match: "Media:",
+        padX: 2,
+        padY: 0,
+        action: () => {
+          setFocusedControl("choice");
+          cycleChoice();
+        }
+      });
+      targets.push({
+        match: "Posts:",
+        padX: 2,
+        padY: 0,
+        action: () => {
+          setFocusedControl("limit");
+          cycleLimit();
+        }
+      });
+      targets.push({
+        match: "Date:",
+        padX: 2,
+        padY: 0,
+        action: () => {
+          setFocusedControl("date");
+          cycleDate();
+        }
+      });
+      targets.push({
+        match: "Meta:",
+        padX: 2,
+        padY: 0,
+        action: () => {
+          setFocusedControl("meta");
+          toggleMetadata();
+        }
+      });
+      targets.push({
+        match: "Resume:",
+        padX: 2,
+        padY: 0,
+        action: () => {
+          setFocusedControl("resume");
+          toggleResume();
+        }
+      });
+      targets.push({
+        match: "Start Batch Queue",
+        padX: 3,
+        padY: 0,
+        action: () => {
+          setFocusedControl("start");
+          startQueue();
+        }
+      });
+      targets.push({
+        match: "tab switch field",
+        action: () => setInputField((prev) => prev === "text" ? "file" : "text")
+      });
+      targets.push({
+        match: "c target",
+        action: cycleChoice
+      });
+      targets.push({
+        match: "m sidecar",
+        action: toggleMetadata
+      });
+      targets.push({
+        match: "l limit",
+        action: cycleLimit
+      });
+      targets.push({
+        match: "d date",
+        action: cycleDate
+      });
+      targets.push({
+        match: "r resume",
+        action: toggleResume
+      });
+      targets.push({
+        match: "\u21B5 start",
+        action: startQueue
+      });
+    }
+    if (phase === "running") {
+      targets.push({
+        match: "Stop queue and return",
+        padX: 2,
+        action: () => {
+          abortControllerRef.current?.abort();
+          setPhase("input");
+        }
+      });
+      targets.push({
+        match: "Stop queue",
+        padX: 2,
+        action: () => {
+          abortControllerRef.current?.abort();
+          setPhase("input");
+        }
+      });
+    }
+    if (phase === "done") {
+      targets.push({
+        match: "Open Downloads Folder",
+        padX: 2,
+        action: () => {
+          const target = outputDir || resolveDefaultDownloadDir("instagram", "batch");
+          revealInFileManager(target);
+        }
+      });
+      targets.push({
+        match: "Return to Start",
+        padX: 2,
+        action: () => setPhase("input")
+      });
+    }
+    onRegisterClickTargets(targets);
+    return () => {
+      onRegisterClickTargets([]);
+    };
+  }, [
+    phase,
+    inputField,
+    focusedControl,
+    onRegisterClickTargets,
+    cyclePlatform,
+    cycleChoice,
+    cycleLimit,
+    cycleDate,
+    toggleMetadata,
+    toggleResume,
+    startQueue,
+    outputDir
+  ]);
+  const panelWidth = Math.max(64, boxWidth);
+  const inputFrameWidth = panelWidth - 18;
+  const innerContentWidth = panelWidth - 6;
+  const colWidth = Math.floor((innerContentWidth - 4) / 2);
   const currentItem = queueItems[currentIndex];
   const completedCount = queueItems.filter((i) => i.status === "success" || i.status === "failed").length;
   const totalCount = queueItems.length > 0 ? queueItems.length : 1;
   const percent = Math.min(100, Math.floor(completedCount / totalCount * 100));
   return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", alignItems: "center", children: [
-    phase === "input" && /* @__PURE__ */ jsx17(Panel, { title: "Batch Queue", width: Math.max(60, boxWidth), children: /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingY: 1, children: [
+    phase === "input" && /* @__PURE__ */ jsx17(Panel, { title: "Batch Queue", width: panelWidth, children: /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", alignItems: "center", paddingY: 1, children: [
       /* @__PURE__ */ jsxs14(Box14, { marginBottom: 1, justifyContent: "center", children: [
-        /* @__PURE__ */ jsx17(Text16, { bold: true, color: inputField === "text" ? theme.primary : theme.gray, children: inputField === "text" ? "\u25CF Links / Handles" : "\u25CB Links / Handles" }),
-        /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "   \xB7   " }),
-        /* @__PURE__ */ jsx17(Text16, { bold: true, color: inputField === "file" ? theme.primary : theme.gray, children: inputField === "file" ? "\u25CF File (.txt)" : "\u25CB File (.txt)" })
+        /* @__PURE__ */ jsx17(Box14, { marginRight: 2, children: /* @__PURE__ */ jsx17(
+          Text16,
+          {
+            bold: true,
+            color: inputField === "text" ? theme.primary : theme.gray,
+            inverse: inputField === "text",
+            children: "  Links / Handles  "
+          }
+        ) }),
+        /* @__PURE__ */ jsx17(Box14, { children: /* @__PURE__ */ jsx17(
+          Text16,
+          {
+            bold: true,
+            color: inputField === "file" ? theme.primary : theme.gray,
+            inverse: inputField === "file",
+            children: "  File (.txt)  "
+          }
+        ) })
       ] }),
-      inputField === "text" ? /* @__PURE__ */ jsx17(FramedInput, { title: "Links or @handles", width: Math.max(56, boxWidth - 4), children: /* @__PURE__ */ jsx17(
-        TextInput,
+      inputField === "text" ? /* @__PURE__ */ jsx17(
+        FramedInput,
         {
-          value: rawText,
-          onChange: setRawText,
-          onSubmit: startQueue,
-          placeholder: "@user1, @user2, tiktok.com/@user3\u2026",
-          width: Math.max(50, boxWidth - 10),
-          focus: focusSection === "input",
-          onTab: () => setInputField("file"),
-          onArrowDown: () => setFocusSection("options")
-        }
-      ) }) : /* @__PURE__ */ jsx17(FramedInput, { title: "Batch file (.txt)", width: Math.max(56, boxWidth - 4), children: /* @__PURE__ */ jsx17(
-        TextInput,
+          title: "Links or @handles",
+          width: inputFrameWidth,
+          button: "download",
+          children: /* @__PURE__ */ jsx17(
+            TextInput,
+            {
+              value: rawText,
+              onChange: setRawText,
+              onSubmit: startQueue,
+              placeholder: "@user1, @user2, tiktok.com/@user3\u2026",
+              width: inputFrameWidth - 4,
+              focus: focusedControl === "input",
+              onArrowDown: () => setFocusedControl("platform"),
+              onArrowUp: () => setFocusedControl("tabs"),
+              onTab: () => setFocusedControl("platform")
+            }
+          )
+        }
+      ) : /* @__PURE__ */ jsx17(
+        FramedInput,
         {
-          value: filePath,
-          onChange: setFilePath,
-          onSubmit: startQueue,
-          placeholder: "e.g. creators.txt or C:\\path\\creators.txt",
-          width: Math.max(50, boxWidth - 10),
-          focus: focusSection === "input",
-          onTab: () => setInputField("text"),
-          onArrowDown: () => setFocusSection("options")
+          title: "Batch file (.txt)",
+          width: inputFrameWidth,
+          button: "download",
+          children: /* @__PURE__ */ jsx17(
+            TextInput,
+            {
+              value: filePath,
+              onChange: setFilePath,
+              onSubmit: startQueue,
+              placeholder: "e.g. creators.txt or C:\\path\\creators.txt",
+              width: inputFrameWidth - 4,
+              focus: focusedControl === "input",
+              onArrowDown: () => setFocusedControl("platform"),
+              onArrowUp: () => setFocusedControl("tabs"),
+              onTab: () => setFocusedControl("platform")
+            }
+          )
         }
-      ) }),
+      ),
       errorMessage ? /* @__PURE__ */ jsx17(Box14, { marginTop: 1, children: /* @__PURE__ */ jsxs14(Text16, { color: "red", children: [
         "\u2717 ",
         errorMessage
@@ -6031,12 +6423,13 @@ function BatchView({
         Box14,
         {
           flexDirection: "column",
+          width: innerContentWidth,
           marginTop: 1,
           borderStyle: "round",
-          borderColor: focusSection === "options" || focusSection === "custom-limit" || focusSection === "custom-date" ? theme.primary : theme.gray,
-          borderDimColor: focusSection === "input",
+          borderColor: focusedControl !== "input" && focusedControl !== "tabs" && focusedControl !== "start" ? theme.primary : theme.gray,
+          borderDimColor: focusedControl === "input" || focusedControl === "tabs" || focusedControl === "start",
           paddingX: 1,
-          children: focusSection === "custom-limit" ? /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
+          children: focusedControl === "custom-limit" ? /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
             /* @__PURE__ */ jsx17(Text16, { bold: true, color: theme.primary, children: "Set post limit (e.g. 24, all):" }),
             /* @__PURE__ */ jsx17(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx17(
               TextInput,
@@ -6046,14 +6439,14 @@ function BatchView({
                 onSubmit: (val) => {
                   const parsed = parseLimit(val);
                   setLimit(parsed);
-                  setFocusSection("options");
+                  setFocusedControl("limit");
                 },
                 width: 24
               }
             ) }),
             /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "\u21B5 confirm \xB7 esc cancel" })
-          ] }) : focusSection === "custom-date" ? /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
-            /* @__PURE__ */ jsx17(Text16, { bold: true, color: theme.primary, children: "Set date or year (e.g. 2021, 2022, 7d):" }),
+          ] }) : focusedControl === "custom-date" ? /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
+            /* @__PURE__ */ jsx17(Text16, { bold: true, color: theme.primary, children: "Set date or year (e.g. 2024, 7d):" }),
             /* @__PURE__ */ jsx17(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx17(
               TextInput,
               {
@@ -6062,44 +6455,106 @@ function BatchView({
                 onSubmit: (val) => {
                   const trimmed = val.trim();
                   setDateFilter(trimmed ? trimmed : "all");
-                  setFocusSection("options");
+                  setFocusedControl("date");
                 },
                 width: 24
               }
             ) }),
             /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "\u21B5 confirm \xB7 esc cancel" })
           ] }) : /* @__PURE__ */ jsxs14(Fragment4, { children: [
-            /* @__PURE__ */ jsxs14(Box14, { justifyContent: "space-between", children: [
-              /* @__PURE__ */ jsxs14(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: [
-                "[c] Media: ",
-                /* @__PURE__ */ jsx17(Text16, { color: theme.primary, bold: true, children: choice.toUpperCase() })
-              ] }),
-              /* @__PURE__ */ jsxs14(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: [
-                "[l] Posts: ",
-                /* @__PURE__ */ jsx17(Text16, { color: theme.primary, bold: true, children: limit ? `${limit}` : "ALL" })
+            /* @__PURE__ */ jsxs14(Box14, { justifyContent: "space-between", width: "100%", children: [
+              /* @__PURE__ */ jsxs14(Box14, { width: colWidth, children: [
+                /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "[p] Platform: " }),
+                /* @__PURE__ */ jsx17(
+                  Text16,
+                  {
+                    bold: true,
+                    color: theme.primary,
+                    inverse: focusedControl === "platform",
+                    children: ` ${defaultPlatform.toUpperCase()} `
+                  }
+                )
               ] }),
-              /* @__PURE__ */ jsxs14(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: [
-                "[d] Date: ",
-                /* @__PURE__ */ jsx17(Text16, { color: theme.primary, bold: true, children: dateFilter.toUpperCase() })
+              /* @__PURE__ */ jsxs14(Box14, { width: colWidth, children: [
+                /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "[c] Media: " }),
+                /* @__PURE__ */ jsx17(
+                  Text16,
+                  {
+                    bold: true,
+                    color: theme.primary,
+                    inverse: focusedControl === "choice",
+                    children: ` ${choice === "all" ? "EVERYTHING" : choice.toUpperCase()} `
+                  }
+                )
               ] })
             ] }),
-            /* @__PURE__ */ jsxs14(Box14, { justifyContent: "space-between", marginTop: 1, children: [
-              /* @__PURE__ */ jsxs14(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: [
-                "[m] Meta: ",
-                /* @__PURE__ */ jsx17(Text16, { color: theme.primary, bold: true, children: writeMetadata ? "ON" : "OFF" })
+            /* @__PURE__ */ jsxs14(Box14, { justifyContent: "space-between", width: "100%", marginTop: 1, children: [
+              /* @__PURE__ */ jsxs14(Box14, { width: colWidth, children: [
+                /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "[l] Posts: " }),
+                /* @__PURE__ */ jsx17(
+                  Text16,
+                  {
+                    bold: true,
+                    color: theme.primary,
+                    inverse: focusedControl === "limit",
+                    children: ` ${limit ? String(limit) : "ALL"} `
+                  }
+                )
               ] }),
-              /* @__PURE__ */ jsxs14(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: [
-                "[r] Resume: ",
-                /* @__PURE__ */ jsx17(Text16, { color: theme.primary, bold: true, children: resume ? "ON" : "OFF" })
+              /* @__PURE__ */ jsxs14(Box14, { width: colWidth, children: [
+                /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "[d] Date: " }),
+                /* @__PURE__ */ jsx17(
+                  Text16,
+                  {
+                    bold: true,
+                    color: theme.primary,
+                    inverse: focusedControl === "date",
+                    children: ` ${dateFilter.toUpperCase()} `
+                  }
+                )
+              ] })
+            ] }),
+            /* @__PURE__ */ jsxs14(Box14, { justifyContent: "space-between", width: "100%", marginTop: 1, children: [
+              /* @__PURE__ */ jsxs14(Box14, { width: colWidth, children: [
+                /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "[m] Meta: " }),
+                /* @__PURE__ */ jsx17(
+                  Text16,
+                  {
+                    bold: true,
+                    color: theme.primary,
+                    inverse: focusedControl === "meta",
+                    children: ` ${writeMetadata ? "ON" : "OFF"} `
+                  }
+                )
               ] }),
-              /* @__PURE__ */ jsx17(Text16, { color: theme.primary, bold: true, children: "[\u21B5] Start Queue" })
+              /* @__PURE__ */ jsxs14(Box14, { width: colWidth, children: [
+                /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "[r] Resume: " }),
+                /* @__PURE__ */ jsx17(
+                  Text16,
+                  {
+                    bold: true,
+                    color: theme.primary,
+                    inverse: focusedControl === "resume",
+                    children: ` ${resume ? "ON" : "OFF"} `
+                  }
+                )
+              ] })
             ] })
           ] })
         }
       ),
-      /* @__PURE__ */ jsx17(Box14, { marginTop: 1, justifyContent: "center", children: /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: focusSection === "input" ? "Press \u2193 to adjust options \xB7 \u21B5 to start queue" : "Hotkeys [c] [l] [d] [m] [r] \xB7 \u2191 to edit text \xB7 \u21B5 to start" }) })
+      /* @__PURE__ */ jsx17(Box14, { justifyContent: "center", marginTop: 1, children: /* @__PURE__ */ jsx17(
+        Text16,
+        {
+          bold: true,
+          color: theme.primary,
+          inverse: focusedControl === "start",
+          children: "  \u21B5 Start Batch Queue  "
+        }
+      ) }),
+      /* @__PURE__ */ jsx17(Box14, { marginTop: 1, justifyContent: "center", children: /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: focusedControl === "input" ? "Type handles or URLs \xB7 \u21B5 or click download to start" : focusedControl === "tabs" ? "Space to switch mode \xB7 \u2193 to edit input" : "\u2190/\u2192/Tab select \xB7 Space/Enter toggle \xB7 \u21B5 start queue \xB7 \u2191 edit input" }) })
     ] }) }),
-    phase === "running" && /* @__PURE__ */ jsx17(Panel, { title: "Batch Queue Running", width: Math.max(60, boxWidth), children: /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingY: 1, children: [
+    phase === "running" && /* @__PURE__ */ jsx17(Panel, { title: "Batch Queue Running", width: panelWidth, children: /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingY: 1, children: [
       /* @__PURE__ */ jsxs14(Box14, { justifyContent: "space-between", marginBottom: 1, children: [
         /* @__PURE__ */ jsxs14(Text16, { color: theme.primary, bold: true, children: [
           "Account ",
@@ -6112,7 +6567,7 @@ function BatchView({
         ] }),
         /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: isCooldown ? "\u23F3 Cooldown active" : "\u25B6 Downloading" })
       ] }),
-      /* @__PURE__ */ jsx17(ProgressBar, { percent, width: 54 }),
+      /* @__PURE__ */ jsx17(ProgressBar, { percent, width: panelWidth - 10 }),
       /* @__PURE__ */ jsx17(Gap2, {}),
       currentItem ? /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", borderStyle: "round", borderColor: theme.primary, paddingX: 1, paddingY: 1, children: [
         /* @__PURE__ */ jsxs14(Box14, { children: [
@@ -6134,7 +6589,7 @@ function BatchView({
       /* @__PURE__ */ jsx17(Gap2, {}),
       /* @__PURE__ */ jsx17(Text16, { color: theme.gray, dimColor: theme.dimSecondary, children: "[esc] Stop queue and return" })
     ] }) }),
-    phase === "done" && result && /* @__PURE__ */ jsx17(Panel, { title: "Batch Queue Completed", width: Math.max(60, boxWidth), children: /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingY: 1, children: [
+    phase === "done" && result && /* @__PURE__ */ jsx17(Panel, { title: "Batch Queue Completed", width: panelWidth, children: /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingY: 1, children: [
       /* @__PURE__ */ jsxs14(Text16, { bold: true, color: theme.primary, children: [
         "\u2713 Successfully processed ",
         result.total,
@@ -6337,6 +6792,7 @@ function InnerApp({
   const [urlInput, setUrlInput] = useState9(initialInput ?? "");
   const [clipboardUrl, setClipboardUrl] = useState9(void 0);
   const [settingsFocus, setSettingsFocus] = useState9("cookies");
+  const [batchClickTargets, setBatchClickTargets] = useState9([]);
   const columns = stdout?.columns && stdout.columns > 0 ? stdout.columns : 80;
   const boxWidth = Math.max(14, Math.min(64, columns - 6));
   const contentWidth = Math.max(10, Math.min(columns - 4, 78));
@@ -6352,7 +6808,7 @@ function InnerApp({
     }
     return { name: "input" };
   });
-  useEffect7(() => {
+  useEffect8(() => {
     try {
       const clip = readClipboard();
       if (clip && (clip.startsWith("http://") || clip.startsWith("https://") || clip.startsWith("@"))) {
@@ -6365,7 +6821,7 @@ function InnerApp({
   const clipboardAccepted = Boolean(clipboardUrl) && urlInput === clipboardUrl;
   const abortControllerRef = useRef5(null);
   const probingTimeoutRef = useRef5(null);
-  useEffect7(() => {
+  useEffect8(() => {
     return () => {
       abortControllerRef.current?.abort();
       if (probingTimeoutRef.current) {
@@ -6506,10 +6962,13 @@ function InnerApp({
       return;
     }
     if (key.escape) {
-      if (phase.name === "settings" || phase.name === "watcher" || phase.name === "batch") {
+      if (phase.name === "settings" || phase.name === "watcher") {
         setPhase({ name: "input" });
         return;
       }
+      if (phase.name === "batch") {
+        return;
+      }
       if (phase.name === "platform") {
         setPhase({ name: "input" });
         return;
@@ -6601,6 +7060,9 @@ function InnerApp({
       targets.push({ match: "Cookies Folder", padX: 2, padY: 1, action: () => setSettingsFocus("cookies") });
       targets.push({ match: "Download Directory", padX: 2, padY: 1, action: () => setSettingsFocus("download") });
     }
+    if (phase.name === "batch") {
+      targets.push(...batchClickTargets);
+    }
     for (const [key, label] of hints) {
       const action = hintAction(key);
       if (action) targets.push({ match: `${key} ${label}`, action });
@@ -6620,7 +7082,8 @@ function InnerApp({
     handleInputSubmit,
     handlePlatformSelect,
     handleModeSelect,
-    resetToInput
+    resetToInput,
+    batchClickTargets
   ]);
   useMouseClick(
     (x, y) => {
@@ -6761,7 +7224,8 @@ function InnerApp({
         gapComponent: Gap,
         defaultChoice: initialChoice,
         defaultLimit: effectiveLimit,
-        defaultWriteMetadata: effectiveWriteMetadata
+        defaultWriteMetadata: effectiveWriteMetadata,
+        onRegisterClickTargets: setBatchClickTargets
       }
     ),
     hints.length > 0 ? /* @__PURE__ */ jsxs15(Fragment5, { children: [
@@ -7114,6 +7578,7 @@ async function main() {
   let themeMode = "auto";
   let isWatchMode = false;
   let batchFile;
+  let cliPlatform;
   let since;
   let until;
   let limit;
@@ -7163,6 +7628,16 @@ async function main() {
       batchFile = args[++i];
     } else if (arg.startsWith("--batch=")) {
       batchFile = arg.slice("--batch=".length);
+    } else if (arg === "-p" || arg === "--platform") {
+      const val = args[++i]?.toLowerCase();
+      if (val === "instagram" || val === "tiktok" || val === "facebook" || val === "x") {
+        cliPlatform = val;
+      }
+    } else if (arg.startsWith("--platform=")) {
+      const val = arg.slice("--platform=".length).toLowerCase();
+      if (val === "instagram" || val === "tiktok" || val === "facebook" || val === "x") {
+        cliPlatform = val;
+      }
     } else if (!arg.startsWith("-") && !initialInput) {
       initialInput = arg;
     }
@@ -7226,6 +7701,7 @@ async function main() {
       const result = await runBatchQueue({
         filePath: batchFile,
         choice,
+        defaultPlatform: cliPlatform || "instagram",
         outputDir,
         since,
         until,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-nami",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Open Nami: terminal-first bulk social media profile downloader for Instagram, TikTok, Facebook & X.",
   "type": "module",
   "bin": {