@tvbs-ai/news-rd 0.3.2 → 0.3.3

package/README.md

@@ -69,13 +69,15 @@ news-rd prompt compile 2026-03-10 0600
 ### Shell Completion
 
 ```bash
-# Bash
-news-rd completion bash >> ~/.bashrc && source ~/.bashrc
+# Bash — add to ~/.bashrc
+echo 'source <(news-rd completion bash)' >> ~/.bashrc
 
-# Zsh
-news-rd completion zsh >> ~/.zshrc && source ~/.zshrc
+# Zsh — add to ~/.zshrc
+echo 'source <(news-rd completion zsh)' >> ~/.zshrc
 ```
 
+Completion auto-updates when the CLI is updated.
+
 ## Update
 
 The CLI automatically checks for new versions and shows a hint after command output. To update:

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-var CLI_VERSION = "0.3.2";
+var CLI_VERSION = "0.3.3";
 var rawArgs = process.argv.slice(2);
 function parseArgs() {
   const options = {
@@ -201,9 +201,11 @@ Commands:
   bash    Output bash completion script
   zsh     Output zsh completion script
 
-Setup:
-  news-rd completion bash >> ~/.bashrc && source ~/.bashrc
-  news-rd completion zsh >> ~/.zshrc && source ~/.zshrc
+Setup (add one line to your shell rc file):
+  echo 'source <(news-rd completion bash)' >> ~/.bashrc
+  echo 'source <(news-rd completion zsh)' >> ~/.zshrc
+
+Then restart your shell or run: source ~/.zshrc
 `
 };
 function showGroupHelp(group) {
@@ -570,111 +572,115 @@ function handleCompletion(command) {
       process.exit(0);
   }
 }
+var COMPLETION_DATA = {
+  groups: "config rundown news prompt token completion",
+  commands: {
+    config: "timeslots",
+    rundown: "get history",
+    news: "candidates trends keywords",
+    prompt: "list show variables resolve compile",
+    token: "generate",
+    completion: "bash zsh"
+  },
+  timeslots: "0600 0700 0800 1400 1500 1600",
+  optionsWithValue: "--base-url --token --category --content-type --limit --version --variables",
+  globalFlags: "--help --version --json"
+};
 function generateBashCompletion() {
+  const d = COMPLETION_DATA;
   return `# bash completion for news-rd
+# Setup: source <(news-rd completion bash)
+# Persist: echo 'source <(news-rd completion bash)' >> ~/.bashrc
+
 _news_rd_completions() {
-  local cur prev groups
+  local cur prev
   cur="\${COMP_WORDS[COMP_CWORD]}"
   prev="\${COMP_WORDS[COMP_CWORD-1]}"
-  groups="config rundown news prompt token completion"
 
-  case "\${COMP_WORDS[1]}" in
-    config)
-      COMPREPLY=($(compgen -W "timeslots" -- "$cur"))
-      ;;
-    rundown)
-      COMPREPLY=($(compgen -W "get history" -- "$cur"))
-      ;;
-    news)
-      COMPREPLY=($(compgen -W "candidates trends keywords" -- "$cur"))
-      ;;
-    prompt)
-      COMPREPLY=($(compgen -W "list show variables resolve compile" -- "$cur"))
-      ;;
-    token)
-      COMPREPLY=($(compgen -W "generate" -- "$cur"))
-      ;;
-    completion)
-      COMPREPLY=($(compgen -W "bash zsh" -- "$cur"))
-      ;;
-    *)
-      if [[ \${COMP_CWORD} -eq 1 ]]; then
-        COMPREPLY=($(compgen -W "$groups --help --version --json" -- "$cur"))
-      fi
+  # If previous word expects a value, don't complete
+  case "$prev" in
+    ${d.optionsWithValue.split(" ").join("|")})
+      COMPREPLY=()
+      return
       ;;
   esac
 
+  # Timeslot completion (position 4+: after group command date)
   case "$prev" in
-    --base-url|--token|--category|--content-type|--limit|--version|--variables)
-      COMPREPLY=()
-      ;;
     get|history|candidates|trends|keywords|resolve|compile)
-      # Suggest timeslots after date
       if [[ \${COMP_CWORD} -ge 4 ]]; then
-        COMPREPLY=($(compgen -W "0600 0700 0800 1400 1500 1600" -- "$cur"))
+        COMPREPLY=($(compgen -W "${d.timeslots}" -- "$cur"))
+        return
       fi
       ;;
   esac
+
+  # Command completion based on group (position 2)
+  if [[ \${COMP_CWORD} -eq 2 ]]; then
+    case "\${COMP_WORDS[1]}" in
+${Object.entries(d.commands).map(
+    ([g, cmds]) => `      ${g}) COMPREPLY=($(compgen -W "${cmds}" -- "$cur")) ;;`
+  ).join("\n")}
+    esac
+    return
+  fi
+
+  # Group completion (position 1)
+  if [[ \${COMP_CWORD} -eq 1 ]]; then
+    COMPREPLY=($(compgen -W "${d.groups} ${d.globalFlags}" -- "$cur"))
+    return
+  fi
 }
 complete -F _news_rd_completions news-rd`;
 }
 function generateZshCompletion() {
+  const d = COMPLETION_DATA;
   return `# zsh completion for news-rd
-#compdef news-rd
+# Setup: source <(news-rd completion zsh)
+# Persist: echo 'source <(news-rd completion zsh)' >> ~/.zshrc
 
 _news_rd() {
-  local -a groups
-  groups=(
-    'config:\u6642\u6BB5\u8207\u74B0\u5883\u8A2D\u5B9A'
-    'rundown:Rundown \u67E5\u8A62\u8207\u7248\u672C\u6BD4\u5C0D'
-    'news:\u5019\u9078\u65B0\u805E\u8207\u8DA8\u52E2\u95DC\u9375\u5B57'
-    'prompt:Prompt \u6A21\u677F\u3001\u8B8A\u6578\u8207\u7DE8\u8B6F'
-    'token:JWT Token \u7BA1\u7406'
-    'completion:Shell auto-completion'
-  )
+  local cur="\${words[CURRENT]}"
+  local group="\${words[2]}"
 
-  local -a timeslots
-  timeslots=(0600 0700 0800 1400 1500 1600)
+  # Group completion (position 2)
+  if (( CURRENT == 2 )); then
+    local -a groups=(
+      'config:\u6642\u6BB5\u8207\u74B0\u5883\u8A2D\u5B9A'
+      'rundown:Rundown \u67E5\u8A62\u8207\u7248\u672C\u6BD4\u5C0D'
+      'news:\u5019\u9078\u65B0\u805E\u8207\u8DA8\u52E2\u95DC\u9375\u5B57'
+      'prompt:Prompt \u6A21\u677F\u3001\u8B8A\u6578\u8207\u7DE8\u8B6F'
+      'token:JWT Token \u7BA1\u7406'
+      'completion:Shell auto-completion'
+    )
+    _describe 'group' groups
+    return
+  fi
 
-  _arguments -C \\
-    '--base-url[API base URL]:url:' \\
-    '--token[JWT token]:token:' \\
-    '--json[Raw JSON output]' \\
-    '--version[Show version]' \\
-    '--help[Show help]' \\
-    '1:group:->group' \\
-    '*::arg:->args'
+  # Command completion (position 3)
+  if (( CURRENT == 3 )); then
+    case "$group" in
+${Object.entries(d.commands).map(([g, cmds]) => {
+    const items = cmds.split(" ").map((c) => `'${c}'`).join(" ");
+    return `      ${g}) compadd ${items} ;;`;
+  }).join("\n")}
+    esac
+    return
+  fi
 
-  case $state in
-    group)
-      _describe 'group' groups
-      ;;
-    args)
-      case \${words[1]} in
-        config)
-          _values 'command' 'timeslots[List timeslots]'
-          ;;
-        rundown)
-          _values 'command' 'get[Get rundown]' 'history[Version history]'
-          ;;
-        news)
-          _values 'command' 'candidates[Scored candidates]' 'trends[Google Trends]' 'keywords[NewsRadar keywords]'
-          ;;
-        prompt)
-          _values 'command' 'list[List prompts]' 'show[Get template]' 'variables[List variables]' 'resolve[Resolve variables]' 'compile[Compiled prompt]'
-          ;;
-        token)
-          _values 'command' 'generate[Generate JWT token]'
-          ;;
-        completion)
-          _values 'command' 'bash[Bash completion]' 'zsh[Zsh completion]'
-          ;;
-      esac
-      ;;
-  esac
-}
+  # Timeslot completion (position 5: after date)
+  if (( CURRENT == 5 )); then
+    compadd ${d.timeslots}
+    return
+  fi
 
-_news_rd "$@"`;
+  # Flag completion
+  if [[ "$cur" == -* ]]; then
+    compadd -- ${d.globalFlags} ${d.optionsWithValue}
+    return
+  fi
+}
+if (( $+functions[compdef] )); then compdef _news_rd news-rd; fi`;
 }
 async function checkForUpdates() {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tvbs-ai/news-rd",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "TVBS News Rundown AI CLI — query rundowns, candidates, trends, and prompts",
   "type": "module",
   "bin": {