slack-term 1.52.0 → 1.53.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slack-term",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/snomiao/slack-term.git"

package/ts/cli.ts

@@ -9,7 +9,7 @@ import { dirname, join, resolve } from "node:path";
 
 import yargs, { type Options } from "yargs";
 import { hideBin } from "yargs/helpers";
-import { guardUrlBoundaries } from "./urlGuard.ts";
+import { fixUrlBoundaries, guardUrlBoundaries } from "./urlGuard.ts";
 import { listProfiles, removeProfile, resolveBotToken, resolveCookie, resolveToken, useProfile, type Profile } from "./profiles.ts";
 import { diagnoseBotMessaging, formatDiagnosis } from "./botdoctor.ts";
 import { cmdAuthLogin, cmdAuthLoginChrome, cmdAuthChrome, cmdAuthFirefox, cmdAuthToken, cmdAuthApp, cmdAuthSave, cmdAuthTokens } from "./auth.ts";
@@ -5825,7 +5825,7 @@ async function main(): Promise<void> {
    *  prefix and thread check first). */
   type SendCli = {
     workspace?: string | undefined; target?: string | undefined; message?: string | undefined; code?: string | undefined;
-    "allow-url-adjacent"?: boolean | undefined; "channel-id"?: string | undefined; "user-id"?: string | undefined;
+    "allow-url-adjacent"?: boolean | undefined; "fix-urls"?: boolean | undefined; "channel-id"?: string | undefined; "user-id"?: string | undefined;
     "as-bot"?: boolean | undefined; broadcast?: boolean | undefined; mentions?: boolean | undefined;
     json?: boolean | undefined;
   };
@@ -5834,7 +5834,7 @@ async function main(): Promise<void> {
    *  its subscriptions. */
   type EditCli = {
     workspace?: string | undefined; target?: string | undefined; newText?: string | undefined; code?: string | undefined;
-    force?: boolean | undefined; "allow-url-adjacent"?: boolean | undefined; "channel-id"?: string | undefined;
+    force?: boolean | undefined; "allow-url-adjacent"?: boolean | undefined; "fix-urls"?: boolean | undefined; "channel-id"?: string | undefined;
     mentions?: boolean | undefined; "as-bot"?: boolean | undefined; tick?: { n?: number } | undefined;
   };
   const runEdit = async (argv: EditCli): Promise<void> => {
@@ -5852,6 +5852,7 @@ async function main(): Promise<void> {
         process.exit(1);
       }
     }
+    if (argv["fix-urls"] && argv.newText) argv = { ...argv, newText: fixUrlBoundaries(argv.newText) };
     const args: EditArgs = { target: argv.target!, newText: argv.newText ?? "", allowUrlAdjacent: argv["allow-url-adjacent"] === true };
     if (argv.tick) args.tick = argv.tick;
     if (settings.prefix) args.lanePrefix = settings.prefix;
@@ -5898,6 +5899,7 @@ async function main(): Promise<void> {
       console.error("Error: message is empty");
       process.exit(1);
     }
+    if (argv["fix-urls"]) argv = { ...argv, message: fixUrlBoundaries(argv.message!) };
     const args: SendArgs = { target: argv.target!, message: argv.message!, allowUrlAdjacent: argv["allow-url-adjacent"] === true };
     if (argv.json) args.json = true;
     if (argv.code) args.code = argv.code;
@@ -6546,6 +6548,7 @@ async function main(): Promise<void> {
         .positional("message", { type: "string", demandOption: true })
         .option("code", { type: "string", describe: "Safety hash to confirm send" })
         .option("allow-url-adjacent", { type: "boolean", default: false, describe: "Warn instead of refusing ambiguous bare URL boundaries" })
+        .option("fix-urls", { type: "boolean", default: false, describe: "Wrap ambiguous bare URLs as <url> (cut at the first non-ASCII character / trailing punctuation) before sending" })
         .option("channel-id", { type: "string", describe: "Raw channel ID" })
         .option("user-id", { type: "string", describe: "Raw user ID (opens DM)" })
         .option("as-bot", { type: "boolean", default: false, describe: "Send via the bot token (xoxb / SLACK_BOT_TOKEN) so a DM notifies the recipient and can be two-way" })
@@ -6724,6 +6727,7 @@ async function main(): Promise<void> {
         .option("code", { type: "string", describe: "Safety hash to confirm send" })
         .option("as-bot", { type: "boolean", describe: "Send via the bot token (default: settings' as_bot)" })
         .option("allow-url-adjacent", { type: "boolean", default: false, describe: "Warn instead of refusing ambiguous bare URL boundaries" })
+        .option("fix-urls", { type: "boolean", default: false, describe: "Wrap ambiguous bare URLs as <url> (cut at the first non-ASCII character / trailing punctuation) before sending" })
         .option("broadcast", { type: "boolean", default: false, describe: "Also send to channel" })
         .option("mentions", { type: "boolean", default: true, describe: "Convert @handle tokens to real mentions (--no-mentions for literal text)" }),
       async (argv) => {
@@ -6758,7 +6762,7 @@ async function main(): Promise<void> {
         if (!text.trim()) { console.error("Error: message is empty (only the prefix)"); process.exit(1); }
         await runSend({
           workspace: (argv as W).workspace, target: `${channel}:${threadTs}`, message: text, code: argv.code,
-          "allow-url-adjacent": argv["allow-url-adjacent"], "as-bot": argv["as-bot"] ?? settings.as_bot ?? false,
+          "allow-url-adjacent": argv["allow-url-adjacent"], "fix-urls": argv["fix-urls"], "as-bot": argv["as-bot"] ?? settings.as_bot ?? false,
           broadcast: argv.broadcast, mentions: argv.mentions, json: argv.json,
         });
       },
@@ -7632,6 +7636,7 @@ async function main(): Promise<void> {
         .option("code", { type: "string", describe: "Safety hash to confirm edit" })
         .option("force", { type: "boolean", default: false, describe: "Apply an edit that BREAKS a `slack ask` / `slack poll` message (new text no longer reads as one, or an answered/void question made open again). Refused by default because collect reads that body back; edits that keep it readable (e.g. writing the ✅ form) need no flag. Prefer `slack ask --edit=` / `--void=`." })
         .option("allow-url-adjacent", { type: "boolean", default: false, describe: "Warn instead of refusing ambiguous bare URL boundaries" })
+        .option("fix-urls", { type: "boolean", default: false, describe: "Wrap ambiguous bare URLs as <url> (cut at the first non-ASCII character / trailing punctuation) before sending" })
         .option("channel-id", { type: "string", describe: "Raw channel ID" })
         .option("mentions", { type: "boolean", default: true, describe: "Convert @handle tokens in the new text to real <@USERID> mentions (on by default). Unresolved handles stay as plain text. Disable with --no-mentions for literal @text." })
         .option("as-bot", { type: "boolean", default: false, describe: "Edit as the bot (xoxb / SLACK_BOT_TOKEN). REQUIRED to correct a message the bot posted: Slack only lets a token edit its OWN messages, so a bot-authored message is uneditable by the user token and chat.update returns cant_update_message. Address it by permalink or --channel-id; an @user target resolves against the BOT's DM list, which is where a bot-authored DM actually lives." }),

package/ts/urlGuard.ts

@@ -16,7 +16,15 @@ const URL_TOKEN = /<https?:\/\/[^\s<>|]+(?:\|[^<>\r\n]*)?>|https?:\/\/[^\t\n\v\f
 /** What may sit right before a bare URL and still let it autolink. */
 const SAFE_BEFORE = /[\t\n\v\f\r (*_~]/;
 
-export type UrlBoundaryIssue = { url: string; side: "before" | "after"; char: string };
+/** `trailing`: the URL ends in ASCII punctuation (`)` without a matching `(`, or `.,:;!?`) that Slack may or may
+ *  not take into the link: `(see https://x/a)` would link `https://x/a)`. Only warned, never refused. */
+export type UrlBoundaryIssue = { url: string; side: "before" | "after" | "trailing"; char: string };
+const TRAILING = /[.,:;!?]$/;
+function trailingChar(url: string): string | undefined {
+  if (TRAILING.test(url)) return url.slice(-1);
+  if (url.endsWith(")") && count(url, "(") < count(url, ")")) return ")";
+  return undefined;
+}
 
 /** Code spans and fences are shown verbatim and never autolinked, so a URL in
  *  one is not a boundary problem; neither is a `[label](url)` link, which is
@@ -97,6 +105,11 @@ export function urlBoundaryIssues(text: string, { markdown = true }: { markdown?
     }
     const after = url.match(/[^\x00-\x7f]|>/);
     if (after) issues.push({ url, side: "after", char: after[0] });
+    else {
+      // `(https://x/a)`: the `)` closes the paren before the URL, as GFM and Slack read it
+      const t = trailingChar(url);
+      if (t && !(t === ")" && before === "(")) issues.push({ url, side: "trailing", char: t });
+    }
   }
   return issues;
 }
@@ -107,22 +120,25 @@ export function adjacentUrls(text: string): string[] {
 
 export function guardUrlBoundaries(
   text: string, allow = false, warn: (message: string) => void = console.error,
-  { sides = ["before", "after"], markdown = true }: {
+  { sides = ["before", "after", "trailing"], markdown = true }: {
     sides?: ReadonlyArray<UrlBoundaryIssue["side"]>; markdown?: boolean;
   } = {},
 ): void {
-  const issues = urlBoundaryIssues(text, { markdown }).filter((i) => sides.includes(i.side));
+  const all = urlBoundaryIssues(text, { markdown });
+  const trailing = all.filter((i) => i.side === "trailing" && sides.includes("trailing"));
+  if (trailing.length) warn(`⚠ URL ends in punctuation Slack may take into the link: ${trailing.map((i) => `${JSON.stringify(i.url)} → ${JSON.stringify(fixUrlBoundaries(`x ${i.url}`).slice(2))}`).join(", ")}. If the ${JSON.stringify(trailing[0]!.char)} is not part of the URL, send the suggested form (or --fix-urls).`);
+  const issues = all.filter((i) => i.side !== "trailing" && sides.includes(i.side));
   if (!issues.length) return;
   const described = issues.map((i) => i.side === "before"
     ? `${JSON.stringify(i.url)} (glued to ${JSON.stringify(i.char)} before it — Slack will NOT make it a link)`
-    : `${JSON.stringify(i.url)} (runs into ${JSON.stringify(i.char)} after it)`);
+    : `${JSON.stringify(i.url)} (runs into ${JSON.stringify(i.char)} after it; non-ASCII in a URL is OK only if intended, otherwise send ${JSON.stringify(fixUrlBoundaries(`x ${i.url}`).slice(2))} or put an ASCII space after the URL)`);
   const fixes = issues.some((i) => i.side === "before")
     ? "Put an ASCII space (or a newline) before the URL, " : "";
   const message = `Ambiguous URL boundary: ${described.join(", ")}. ` +
     `${fixes}Put the URL on its own line, or wrap it as <url> / <url|label>. ` +
-    "Use --allow-url-adjacent to warn only.";
+    "Use --fix-urls to wrap them, or --allow-url-adjacent to warn only.";
   if (!allow) throw new Error(message);
-  warn(`Warning: ${message}`);
+  warn(`⚠ Warning: ${message}`);
 }
 
 type RichTextElement =
@@ -167,6 +183,27 @@ export function linkifyRichText(text: string): RichTextElement[] {
   return out;
 }
 
+/** Optional auto-fix (`--fix-urls`): wrap every ambiguous bare URL as `<url>`, cut where Slack's link would end
+ *  (at the first non-ASCII character, before trailing punctuation). Text, code spans and explicit links are kept. */
+export function fixUrlBoundaries(text: string): string {
+  const masked = maskCode(text);
+  let out = "", pos = 0;
+  for (const m of masked.matchAll(URL_TOKEN)) {
+    const at = m.index ?? 0;
+    if (m[0].startsWith("<")) continue;
+    let url = text.slice(at, at + m[0].length);
+    const cut = url.search(/[^\x00-\x7f]|>/);
+    if (cut >= 0) url = url.slice(0, cut);
+    while (trailingChar(url)) url = url.slice(0, -1);
+    const before = at > 0 ? masked[at - 1]! : "";
+    const ambiguous = url.length < m[0].length || (before && !SAFE_BEFORE.test(before));
+    if (!ambiguous || !/^https?:\/\/./i.test(url)) continue;
+    out += text.slice(pos, at) + `<${url}>`;
+    pos = at + url.length;
+  }
+  return out + text.slice(pos);
+}
+
 function count(s: string, ch: string): number {
   return s.split(ch).length - 1;
 }