@mmerterden/multi-agent-pipeline 20.2.1 → 20.3.1

package/pipeline/scripts/github-ssh-setup.sh

@@ -15,6 +15,120 @@
 
 set -euo pipefail
 
+# Every line a person reads resolves through the table below, so this script
+# answers to the same language preference the rest of the pipeline answers to.
+#
+# The file is checked for before it is sourced, because a `.` of a path that is
+# not there takes the shell with it and the later candidates are never reached.
+for _ma_uf in \
+  "$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)/user-facing.sh" \
+  "$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/../lib" 2>/dev/null && pwd)/user-facing.sh" \
+  "$HOME/.claude/lib/user-facing.sh" \
+  "$HOME/.copilot/lib/user-facing.sh" \
+  "$HOME/.codex/lib/user-facing.sh"; do
+  [ -f "$_ma_uf" ] || continue
+  # shellcheck source=/dev/null
+  . "$_ma_uf" 2>/dev/null || true
+  if command -v ma_output_lang >/dev/null 2>&1; then break; fi
+done
+unset _ma_uf
+if ! command -v ma_output_lang >/dev/null 2>&1; then
+  echo "Error: user-facing.sh not found. Install: npx @mmerterden/multi-agent-pipeline install" >&2
+  exit 1
+fi
+OUT_LANG=$(ma_output_lang)
+
+# One table, both languages on the same line, so a wording change cannot land
+# on one of them. English is the default and the fallback.
+#
+# The overwrite and test prompts keep asking for `e` or `h` in either language:
+# the same two letters answer SSH_SETUP_OVERWRITE and SSH_SETUP_TEST, and the
+# comparisons below read them.
+msg() { # $1 = key, $2.. = printf arguments
+    local key="$1" en tr fmt
+    shift
+    case "$key" in
+        title)
+            en='=== GitHub SSH Key Setup ==='
+            tr='=== GitHub SSH Key Kurulumu ===' ;;
+        ask-email)
+            en='Enter your GitHub email address: '
+            tr='GitHub e-posta adresinizi girin: ' ;;
+        email-empty)
+            en='Error: the email address cannot be empty.'
+            tr='Hata: E-posta adresi boş olamaz.' ;;
+        email-missing-unattended)
+            en='Error: MULTI_AGENT_UNATTENDED=1 and SSH_SETUP_EMAIL is not set.'
+            tr='Hata: MULTI_AGENT_UNATTENDED=1 ve SSH_SETUP_EMAIL tanımlı değil.' ;;
+        email-missing-headless)
+            en='Error: there is no terminal and SSH_SETUP_EMAIL is not set.'
+            tr='Hata: terminal yok ve SSH_SETUP_EMAIL tanımlı değil.' ;;
+        headless-hint)
+            en='      To run it headless: SSH_SETUP_EMAIL=you@example.com %s'
+            tr='      Başsız çalıştırmak için: SSH_SETUP_EMAIL=you@example.com %s' ;;
+        key-exists)
+            en='Warning: %s already exists.'
+            tr='Uyari: %s zaten mevcut.' ;;
+        ask-overwrite)
+            en='Overwrite it? (e = yes / h = no): '
+            tr='Üzerine yazmak istiyor musunuz? (e/h): ' ;;
+        cancelled)
+            en='Cancelled.'
+            tr='İşlem iptal edildi.' ;;
+        generating)
+            en='Generating the SSH key...'
+            tr='SSH key oluşturuluyor...' ;;
+        generated)
+            en='The SSH key was created.'
+            tr='SSH key başarıyla oluşturuldu!' ;;
+        config-updated)
+            en='SSH config updated.'
+            tr='SSH config güncellendi.' ;;
+        agent-add-failed)
+            en='[Warning: the key could not be added to ssh-agent  -  by hand: ssh-add %s]'
+            tr="[Uyari: anahtar ssh-agent'a eklenemedi  -  elle: ssh-add %s]" ;;
+        public-key-heading)
+            en='  Your public key (this is what goes into GitHub):'
+            tr="  Public key'iniz (aşağıdaki GitHub'a eklenecek):" ;;
+        clipboard-ok)
+            en='[Copied to the clipboard.]'
+            tr='[Otomatik olarak panoya kopyalandı!]' ;;
+        clipboard-none)
+            en='[Could not copy to the clipboard  -  copy the key above by hand]'
+            tr='[Panoya kopyalanamadı  -  yukarıdaki anahtarı manuel kopyalayın]' ;;
+        next-steps)
+            en='=== Next Steps ==='
+            tr='=== Sonraki Adımlar ===' ;;
+        next-step-1)
+            en='1. Go to https://github.com/settings/ssh/new'
+            tr='1. https://github.com/settings/ssh/new adresine gidin' ;;
+        next-step-2)
+            en="2. Give it a name in the 'Title' field (e.g. MacBook)"
+            tr="2. 'Title' alanına bir isim verin (ör: MacBook)" ;;
+        next-step-3)
+            en="3. Paste the copied key into the 'Key' field (Cmd+V)"
+            tr="3. 'Key' alanına kopyalanan key'i yapıştırın (Cmd+V)" ;;
+        next-step-4)
+            en="4. Click the 'Add SSH key' button"
+            tr="4. 'Add SSH key' butonuna tıklayın" ;;
+        ask-test)
+            en='Test the connection now that the key is on GitHub? (e = yes / h = no): '
+            tr="Key'i GitHub'a ekledikten sonra test etmek ister misiniz? (e/h): " ;;
+        testing)
+            en='Testing the GitHub connection...'
+            tr='GitHub bağlantısı test ediliyor...' ;;
+        finished)
+            en='Done.'
+            tr='Tamamlandı!' ;;
+        *)
+            printf 'github-ssh-setup: no message for %s\n' "$key" >&2
+            return 1 ;;
+    esac
+    [ "$OUT_LANG" = tr ] && fmt="$tr" || fmt="$en"
+    # shellcheck disable=SC2059
+    printf "$fmt\n" "$@"
+}
+
 # Soruyu sor, ama yalnız soracak birisi varsa. Terminal yoksa env'deki cevabı
 # kullan; o da yoksa boş dön ve kararı çağırana bırak.
 ask() {
@@ -38,22 +152,22 @@ ask() {
     printf -v "$__var" '%s' "$reply"
 }
 
-echo "=== GitHub SSH Key Kurulumu ==="
+msg title
 echo ""
 
 # E-posta adresi al
-ask "GitHub e-posta adresinizi girin: " "${SSH_SETUP_EMAIL:-}" EMAIL
+ask "$(msg ask-email)" "${SSH_SETUP_EMAIL:-}" EMAIL
 
 if [ -z "$EMAIL" ]; then
     if [ -t 0 ] && [ "${MULTI_AGENT_UNATTENDED:-}" != "1" ]; then
-        echo "Hata: E-posta adresi boş olamaz."
+        msg email-empty
     else
         if [ "${MULTI_AGENT_UNATTENDED:-}" = "1" ]; then
-            echo "Hata: MULTI_AGENT_UNATTENDED=1 ve SSH_SETUP_EMAIL tanımlı değil." >&2
+            msg email-missing-unattended >&2
         else
-            echo "Hata: terminal yok ve SSH_SETUP_EMAIL tanımlı değil." >&2
+            msg email-missing-headless >&2
         fi
-        echo "      Başsız çalıştırmak için: SSH_SETUP_EMAIL=you@example.com $0" >&2
+        msg headless-hint "$0" >&2
     fi
     exit 1
 fi
@@ -69,19 +183,19 @@ chmod 700 "$HOME/.ssh"
 # Mevcut key kontrolü
 if [ -f "$KEY_PATH" ]; then
     echo ""
-    echo "Uyari: $KEY_PATH zaten mevcut."
+    msg key-exists "$KEY_PATH"
     # Varsayılan HAYIR. Başsız bir koşuda cevapsız kalan bir "üzerine yazayım
     # mı" sorusunun güvenli tarafı, var olan anahtarı korumaktır.
-    ask "Üzerine yazmak istiyor musunuz? (e/h): " "${SSH_SETUP_OVERWRITE:-}" OVERWRITE
+    ask "$(msg ask-overwrite)" "${SSH_SETUP_OVERWRITE:-}" OVERWRITE
     if [ "$OVERWRITE" != "e" ]; then
-        echo "İşlem iptal edildi."
+        msg cancelled
         exit 0
     fi
 fi
 
 # SSH key oluştur (Ed25519 - modern ve güvenli)
 echo ""
-echo "SSH key oluşturuluyor..."
+msg generating
 # ssh-keygen var olan bir dosyayı görünce KENDİ "Overwrite (y/n)?" sorusunu
 # sorar - yani yukarıdaki onayı geçtikten sonra başsız koşu ikinci bir
 # soruda asılır. Onay zaten alındı; dosyayı önce kaldır.
@@ -89,13 +203,13 @@ rm -f "$KEY_PATH" "${KEY_PATH}.pub"
 ssh-keygen -t ed25519 -C "$EMAIL" -f "$KEY_PATH" -N "" -q
 
 echo ""
-echo "SSH key başarıyla oluşturuldu!"
+msg generated
 
 # SSH agent'a ekle
 eval "$(ssh-agent -s)" > /dev/null 2>&1
 
-# SSH config ayarla (UseKeychain yalnızca macOS'ta geçerli bir seçenek;
-# Linux'ta ssh bilinmeyen seçenek diye config'i reddeder)
+# SSH config ayarla (UseKeychain Apple'ın ssh'ına özgü bir seçenek; onu tanımayan
+# bir ssh config'i bilinmeyen seçenek diye reddeder)
 SSH_CONFIG="$HOME/.ssh/config"
 USE_KEYCHAIN_LINE=""
 if [ "$(uname -s 2>/dev/null)" = "Darwin" ]; then
@@ -112,7 +226,7 @@ Host github.com
 ${USE_KEYCHAIN_LINE}
 EOF
     chmod 600 "$SSH_CONFIG"
-    echo "SSH config güncellendi."
+    msg config-updated
 fi
 
 # Key'i agent'a ekle (macOS Keychain ile)
@@ -121,12 +235,12 @@ fi
 # göstermemek demek.
 ssh-add --apple-use-keychain "$KEY_PATH" 2>/dev/null \
   || ssh-add "$KEY_PATH" 2>/dev/null \
-  || echo "[Uyari: anahtar ssh-agent'a eklenemedi  -  elle: ssh-add $KEY_PATH]"
+  || msg agent-add-failed "$KEY_PATH"
 
 # Public key'i göster ve kopyala
 echo ""
 echo "================================================"
-echo "  Public key'iniz (aşağıdaki GitHub'a eklenecek):"
+msg public-key-heading
 echo "================================================"
 echo ""
 cat "${KEY_PATH}.pub"
@@ -135,31 +249,28 @@ echo ""
 # Panoya kopyala
 if command -v pbcopy >/dev/null 2>&1; then
   pbcopy < "${KEY_PATH}.pub"
-  echo "[Otomatik olarak panoya kopyalandı!]"
-elif command -v xclip >/dev/null 2>&1; then
-  xclip -selection clipboard < "${KEY_PATH}.pub"
-  echo "[Otomatik olarak panoya kopyalandı! (xclip)]"
+  msg clipboard-ok
 else
-  echo "[Panoya kopyalanamadı  -  yukarıdaki anahtarı manuel kopyalayın]"
+  msg clipboard-none
 fi
 
 echo ""
-echo "=== Sonraki Adımlar ==="
-echo "1. https://github.com/settings/ssh/new adresine gidin"
-echo "2. 'Title' alanına bir isim verin (ör: MacBook)"
-echo "3. 'Key' alanına kopyalanan key'i yapıştırın (Cmd+V)"
-echo "4. 'Add SSH key' butonuna tıklayın"
+msg next-steps
+msg next-step-1
+msg next-step-2
+msg next-step-3
+msg next-step-4
 echo ""
 
 # GitHub'a key eklendikten sonra test
-ask "Key'i GitHub'a ekledikten sonra test etmek ister misiniz? (e/h): " "${SSH_SETUP_TEST:-}" TEST
+ask "$(msg ask-test)" "${SSH_SETUP_TEST:-}" TEST
 if [ "$TEST" = "e" ]; then
     echo ""
-    echo "GitHub bağlantısı test ediliyor..."
+    msg testing
     # Bilinmeyen host anahtarı üçüncü bir interaktif soru demek; başsız
     # koşuda orada asılırdı.
     ssh -o StrictHostKeyChecking=accept-new -T git@github.com 2>&1 || true
 fi
 
 echo ""
-echo "Tamamlandı!"
+msg finished

package/pipeline/scripts/graph-mermaid.mjs

@@ -43,6 +43,7 @@ import { loadGraph, defaultGraphPath } from "./graph-query.mjs";
 import { findByName, affected } from "./graph-affected.mjs";
 import { runMain } from "../lib/fatal.mjs";
 import { invokedDirectly } from "../lib/invoked-directly.mjs";
+import { hostCommand } from "../lib/user-facing.mjs";
 
 const DEFAULT_MAX_NODES = 25;
 
@@ -187,7 +188,9 @@ function main() {
     // Not an error to shout about: a repo with no graph yet simply has no
     // diagram, and the caller records the reason instead of drawing nothing and
     // calling it empty.
-    console.error(`graph-mermaid: no code graph at ${graphPath} - run /multi-agent:graph first`);
+    console.error(
+      `graph-mermaid: no code graph at ${graphPath} - run ${hostCommand("graph", import.meta.dirname)} first`,
+    );
     process.exit(1);
   }
 

package/pipeline/scripts/issues.mjs

@@ -0,0 +1,236 @@
+#!/usr/bin/env node
+/**
+ * @file issues.mjs  -  the open items assigned to you, from Jira and GitHub,
+ * in one shape a picker or a client can render.
+ *
+ * `/multi-agent:jira` and `/multi-agent:issue` build this list in prose, one
+ * model call at a time. This is the deterministic producer of the same list:
+ *
+ *   Jira    jira-search.sh with the JQL the jira command uses
+ *           (assignee=currentUser() AND resolution = EMPTY AND status not in
+ *           (Done,Closed,Cancelled)), optionally narrowed by --project
+ *   GitHub  gh search issues --assignee=@me --state=open
+ *
+ * Every item is {key, summary, status, type, priority, source}. Nothing else
+ * from either API is copied through: no `self`, no `url`, no host, no avatar,
+ * no reporter. A summary is free text, so URLs, e-mail addresses and home
+ * paths inside it are replaced with a marker before it is printed.
+ *
+ * A source that fails does not fail the list. It is reported in `sources[]`
+ * with a fixed reason code - `not-onboarded`, `unavailable` or `failed` - and
+ * never with the tool's stderr, which can name a host.
+ *
+ * Nothing in the output is machine-specific, so `--redact` changes nothing;
+ * it is accepted so every contract output takes the same flag.
+ *
+ * Seams for tests: MA_JIRA_SEARCH (path to a jira-search.sh stand-in) and
+ * MA_GH_BIN (a gh stand-in).
+ *
+ * Usage:
+ *   node issues.mjs --json [--redact] [--source jira|github|all] [--project KEY]... [--max N]
+ *
+ * Exit: 0 printed (including a source that failed), 2 usage error.
+ *
+ * @module pipeline/scripts/issues
+ */
+
+import { spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { scrub } from "./_redact.mjs";
+import { runMain } from "../lib/fatal.mjs";
+import { invokedDirectly } from "../lib/invoked-directly.mjs";
+
+export { scrub };
+export const CONTRACT_VERSION = "1.0.0";
+const TIMEOUT_MS = 60000;
+
+export const BASE_JQL =
+  "assignee=currentUser() AND resolution = EMPTY AND status not in (Done,Closed,Cancelled)";
+
+/** Same precedence the jira command sorts by. */
+const PRIORITY_RANK = {
+  blocker: 100,
+  critical: 90,
+  highest: 90,
+  high: 80,
+  medium: 50,
+  low: 30,
+  lowest: 10,
+};
+const STATUS_RANK = { "in progress": 3, "in review": 2, "to do": 1 };
+
+export function jqlFor(projects = []) {
+  const keys = projects.filter((k) => /^[A-Z][A-Z0-9_]*$/.test(k));
+  return keys.length ? `${BASE_JQL} AND project in (${keys.join(",")})` : BASE_JQL;
+}
+
+/** Jira's search JSON to items. Throws on a body that is not a search result. */
+export function jiraItems(json) {
+  if (!json || !Array.isArray(json.issues)) throw new Error("not a search result");
+  return json.issues
+    .filter((i) => i && typeof i.key === "string")
+    .map((i) => {
+      const f = i.fields ?? {};
+      return {
+        key: i.key,
+        summary: scrub(f.summary),
+        status: f.status?.name ?? null,
+        type: f.issuetype?.name ?? null,
+        priority: f.priority?.name ?? null,
+        source: "jira",
+        created: f.created ?? null,
+      };
+    });
+}
+
+/** `gh search issues --json` to items. */
+export function githubItems(json) {
+  if (!Array.isArray(json)) throw new Error("not a search result");
+  return json
+    .filter((i) => i && Number.isInteger(i.number) && i.repository?.nameWithOwner)
+    .map((i) => {
+      const labels = (i.labels ?? []).map((l) => String(l?.name ?? "").toLowerCase());
+      return {
+        key: `${i.repository.nameWithOwner}#${i.number}`,
+        summary: scrub(i.title),
+        status: i.state ? String(i.state).toLowerCase() : "open",
+        type: labels.includes("bug") ? "bug" : "issue",
+        priority: null,
+        source: "github",
+        created: i.createdAt ?? null,
+      };
+    });
+}
+
+/** Priority first, then status, then newest - the jira command's order, for both sources. */
+export function sortItems(items) {
+  const p = (i) => PRIORITY_RANK[String(i.priority ?? "").toLowerCase()] ?? 0;
+  const s = (i) => STATUS_RANK[String(i.status ?? "").toLowerCase()] ?? 0;
+  const c = (i) => Date.parse(i.created ?? "") || 0;
+  return [...items].sort((a, b) => p(b) - p(a) || s(b) - s(a) || c(b) - c(a));
+}
+
+function run(bin, args, env) {
+  return spawnSync(bin, args, { encoding: "utf8", timeout: TIMEOUT_MS, env });
+}
+
+export function fetchJira({ projects = [], max = 50, env = process.env } = {}) {
+  const script = env.MA_JIRA_SEARCH || fileURLToPath(new URL("./jira-search.sh", import.meta.url));
+  const r = run(
+    "bash",
+    [
+      script,
+      "--jql",
+      jqlFor(projects),
+      "--fields",
+      "key,summary,status,issuetype,priority,created",
+      "--max",
+      String(max),
+    ],
+    env,
+  );
+  if (r.error) return { ok: false, reason: "unavailable", items: [] };
+  if (r.status !== 0) {
+    const reason = /not onboarded|no preferences file/.test(r.stderr || "")
+      ? "not-onboarded"
+      : "failed";
+    return { ok: false, reason, items: [] };
+  }
+  try {
+    return { ok: true, items: jiraItems(JSON.parse(r.stdout)) };
+  } catch {
+    return { ok: false, reason: "failed", items: [] };
+  }
+}
+
+export function fetchGithub({ max = 50, env = process.env } = {}) {
+  const gh = env.MA_GH_BIN || "gh";
+  const r = run(
+    gh,
+    [
+      "search",
+      "issues",
+      "--assignee=@me",
+      "--state=open",
+      "--json",
+      "number,title,repository,labels,state,createdAt",
+      "--limit",
+      String(max),
+    ],
+    env,
+  );
+  if (r.error) return { ok: false, reason: "unavailable", items: [] };
+  if (r.status !== 0) return { ok: false, reason: "failed", items: [] };
+  try {
+    return { ok: true, items: githubItems(JSON.parse(r.stdout)) };
+  } catch {
+    return { ok: false, reason: "failed", items: [] };
+  }
+}
+
+/** The whole answer, as printed. */
+export function collect({ source = "all", projects = [], max = 50, env = process.env } = {}) {
+  const sources = [];
+  let items = [];
+  const wanted = source === "all" ? ["jira", "github"] : [source];
+  for (const name of wanted) {
+    const res = name === "jira" ? fetchJira({ projects, max, env }) : fetchGithub({ max, env });
+    sources.push(
+      res.ok
+        ? { source: name, ok: true, count: res.items.length }
+        : { source: name, ok: false, count: 0, reason: res.reason },
+    );
+    items = items.concat(res.items);
+  }
+  return {
+    contractVersion: CONTRACT_VERSION,
+    items: sortItems(items).map(({ created: _created, ...rest }) => rest),
+    sources,
+  };
+}
+
+function main(argv) {
+  let json = false;
+  let source = "all";
+  let max = 50;
+  const projects = [];
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "--json") json = true;
+    else if (a === "--redact") continue;
+    else if (a === "--source") source = argv[++i];
+    else if (a === "--project") projects.push(argv[++i]);
+    else if (a === "--max") max = Number(argv[++i]);
+    else {
+      process.stderr.write(`issues: unknown argument ${a}\n`);
+      return 2;
+    }
+  }
+  if (!["jira", "github", "all"].includes(source)) {
+    process.stderr.write("issues: --source is jira, github or all\n");
+    return 2;
+  }
+  if (!Number.isInteger(max) || max < 1 || max > 200) {
+    process.stderr.write("issues: --max is a whole number from 1 to 200\n");
+    return 2;
+  }
+  const out = collect({ source, projects, max });
+  if (json) process.stdout.write(JSON.stringify(out, null, 2) + "\n");
+  else {
+    for (const i of out.items) {
+      process.stdout.write(
+        `[${i.priority ?? " - "}] ${i.key}  -  ${i.summary}  (${i.status ?? "-"})\n`,
+      );
+    }
+    for (const s of out.sources.filter((x) => !x.ok)) {
+      process.stdout.write(`${s.source}: ${s.reason}\n`);
+    }
+  }
+  return 0;
+}
+
+if (invokedDirectly(import.meta.url)) {
+  runMain("issues", () => {
+    process.exitCode = main(process.argv.slice(2));
+  });
+}

package/pipeline/scripts/jira-attach.sh

@@ -32,6 +32,10 @@ shift 2>/dev/null || true
 
 PREFS="$HOME/.claude/multi-agent-preferences.json"
 
+_MA_JA_HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=/dev/null
+if [ -f "$_MA_JA_HERE/../lib/user-facing.sh" ]; then . "$_MA_JA_HERE/../lib/user-facing.sh"; else . "$HOME/.claude/lib/user-facing.sh"; fi
+
 if [ -z "${JIRA_BASE:-}" ]; then
   JIRA_BASE=$(node -e '
     const fs=require("fs");
@@ -48,10 +52,10 @@ if [ -z "${JIRA_TOKEN:-}" ]; then
     try{const g=(JSON.parse(fs.readFileSync(process.argv[1],"utf8")).global||{});
         process.stdout.write((g.keychainMapping||{}).jira||"")}catch{process.stdout.write("")}
   ' "$PREFS" 2>/dev/null)
-  [ -n "$KEY" ] || { echo "jira-attach: keychainMapping.jira is not set  -  onboard it via /multi-agent:setup" >&2; exit 2; }
+  [ -n "$KEY" ] || { echo "jira-attach: keychainMapping.jira is not set  -  onboard it via $(ma_command setup)" >&2; exit 2; }
   JIRA_TOKEN=$(bash "$HOME/.claude/lib/credential-store.sh" get "$KEY" 2>/dev/null)
 fi
-[ -n "${JIRA_TOKEN:-}" ] || { echo "jira-attach: no Jira token  -  onboard it via /multi-agent:setup" >&2; exit 2; }
+[ -n "${JIRA_TOKEN:-}" ] || { echo "jira-attach: no Jira token  -  onboard it via $(ma_command setup)" >&2; exit 2; }
 
 RC=0
 for f in "$@"; do

package/pipeline/scripts/jira-search.sh

@@ -5,7 +5,8 @@
 # A thin front door onto `jira_search` in lib/issue-fetcher.sh, which owns the
 # credential resolution, the host lookup and the rule that a token never reaches
 # argv. This file adds exactly two things that function does not do for itself:
-# it resolves the account from preferences, and it URL-encodes the JQL.
+# it resolves the account from preferences, and it URL-encodes the query
+# parameters (the JQL, the field list and the result cap).
 #
 # The encoding is not a detail. A JQL carrying a quoted label, a space or an
 # `=` reaches the server mangled otherwise, and the failure is a 400 that reads
@@ -66,5 +67,5 @@ command -v jira_search >/dev/null 2>&1 || {
   exit 1
 }
 
-ENCODED=$(printf '%s' "$JQL" | python3 -c 'import sys,urllib.parse; print(urllib.parse.quote(sys.stdin.read()))')
-jira_search "$ENCODED" "$FIELDS" "$MAXR"
+urlq() { printf '%s' "$1" | python3 -c 'import sys,urllib.parse; print(urllib.parse.quote(sys.stdin.read(), safe=sys.argv[1]))' "$2"; }
+jira_search "$(urlq "$JQL" /)" "$(urlq "$FIELDS" ,)" "$(urlq "$MAXR" "")"