plugin-scanner 3.0.0a198__tar.gz → 3.0.0a199__tar.gz

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugin-scanner
-Version: 3.0.0a198
+Version: 3.0.0a199
 Summary: Lint, verify, and gate plugin ecosystems for maintainers, CI, and publish workflows.
 Project-URL: Homepage, https://hol.org/guard
 Project-URL: Security, https://hol.org/guard/security

plugin_scanner-3.0.0a199/ci/test-suite-ratchet-baseline.json

@@ -0,0 +1,5 @@
+{
+  "maximum_collected_cases": 15154,
+  "maximum_test_source_lines": 327197,
+  "schema_version": 1
+}

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/dashboard/src/local-cli-api.test.ts

@@ -6,6 +6,8 @@ import {
   normalizeLocalCliItem,
   normalizeLocalCliList,
   suggestedCustomExtensions,
+  suggestedHarnessExtensions,
+  suggestedSeenExtensions,
 } from "./local-cli-api";
 import { parseProtectionRoute, localCliHref } from "./local-cli-links";
 
@@ -41,6 +43,7 @@ assert.equal(item.name, "cwv.py");
 assert.equal(item.state, "allowed");
 assert.equal(item.surface, "cli");
 assert.equal(item.server_identity_hash, null);
+assert.equal(item.source_label, null);
 assert.equal(item.commands[0]?.command_id, "root");
 
 const mcpItem = normalizeLocalCliItem({
@@ -65,6 +68,10 @@ const mcpItem = normalizeLocalCliItem({
 });
 assert.equal(mcpItem.surface, "mcp");
 assert.equal(mcpItem.server_identity_hash, "b".repeat(64));
+assert.equal(
+  normalizeLocalCliItem({ ...mcpItem, source_label: "Codex, Claude Code" }).source_label,
+  "Codex, Claude Code",
+);
 assert.equal(isLocalCliId(mcpItem.cli_id), true);
 assert.equal(
   normalizeLocalCliItem({ ...mcpItem, server_identity_hash: "not-a-hash" }).server_identity_hash,
@@ -116,6 +123,15 @@ const grepItem = normalizeLocalCliItem({
 const mixed = [item, blockedItem, unsetItem, grepItem];
 assert.deepEqual(addedCustomExtensions(mixed).map((entry) => entry.state), ["allowed", "blocked"]);
 assert.deepEqual(suggestedCustomExtensions(mixed).map((entry) => entry.name), ["unset-tool"]);
+const harnessUnset = normalizeLocalCliItem({
+  ...unsetItem,
+  cli_id: "local-cli.mcp-abcdef12",
+  name: "github",
+  surface: "mcp",
+  source_label: "Codex",
+});
+assert.deepEqual(suggestedHarnessExtensions([unsetItem, harnessUnset]).map((entry) => entry.name), ["github"]);
+assert.deepEqual(suggestedSeenExtensions([unsetItem, harnessUnset]).map((entry) => entry.name), ["unset-tool"]);
 
 const fallbackCloud = normalizeLocalCliList({
   schema_version: "guard.daemon.local-clis.v1",

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/dashboard/src/local-cli-api.ts

@@ -27,6 +27,7 @@ export type LocalCliItem = {
   help_status: "ok" | "empty" | "failed" | null;
   surface: LocalCliSurface;
   server_identity_hash: string | null;
+  source_label: string | null;
   state: LocalCliState;
   stale: boolean;
   grant_revision: number | null;
@@ -103,6 +104,14 @@ export function suggestedCustomExtensions(items: readonly LocalCliItem[]): Local
   return items.filter((item) => item.state === "unset" && item.suggestable);
 }
 
+export function suggestedHarnessExtensions(items: readonly LocalCliItem[]): LocalCliItem[] {
+  return suggestedCustomExtensions(items).filter((item) => item.source_label !== null);
+}
+
+export function suggestedSeenExtensions(items: readonly LocalCliItem[]): LocalCliItem[] {
+  return suggestedCustomExtensions(items).filter((item) => item.source_label === null);
+}
+
 export function normalizeLocalCliItem(value: unknown): LocalCliItem {
   if (!isRecord(value)) throw new Error("Invalid local CLI item");
   const cliId = requiredString(value.cli_id, "id");
@@ -126,6 +135,7 @@ export function normalizeLocalCliItem(value: unknown): LocalCliItem {
     help_status: normalizeHelpStatus(value.help_status),
     surface: value.surface === "mcp" ? "mcp" : "cli",
     server_identity_hash: normalizeIdentityHash(value.server_identity_hash),
+    source_label: optionalSourceLabel(value.source_label),
     state,
     stale: value.stale === true,
     grant_revision: value.grant_revision === null || value.grant_revision === undefined
@@ -148,6 +158,12 @@ function normalizeIdentityHash(value: unknown): string | null {
   return value;
 }
 
+function optionalSourceLabel(value: unknown): string | null {
+  if (value === null || value === undefined || value === "") return null;
+  if (typeof value !== "string") return null;
+  return value.trim().slice(0, 120) || null;
+}
+
 export function normalizeLocalCliCommand(value: unknown): LocalCliCommand {
   if (!isRecord(value)) throw new Error("Invalid local CLI command");
   const state = value.state;
@@ -215,7 +231,10 @@ export async function previewLocalCliMutation(payload: LocalCliMutationPayload):
   return { summary: requiredString(body.summary, "summary") };
 }
 
-export async function recognizeLocalCli(command: string): Promise<{
+export async function recognizeLocalCli(
+  command: string,
+  options?: { cliId?: string },
+): Promise<{
   item: LocalCliItem;
   summary: string;
   revision: number;
@@ -224,7 +243,10 @@ export async function recognizeLocalCli(command: string): Promise<{
   const body = await readJson(await fetchLocalCliApi("/v1/local-clis/recognize", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ command }),
+    body: JSON.stringify({
+      command,
+      ...(options?.cliId ? { cli_id: options.cliId } : {}),
+    }),
   }));
   if (!isRecord(body)) throw new Error("Invalid local CLI recognition");
   const item = normalizeLocalCliItem(body.item);

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/dashboard/src/protection-center/add-custom-extension-dialog.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import type { ChangeEvent, FormEvent } from "react";
 
 import {
@@ -11,7 +11,8 @@ import {
   LocalCliApiError,
   previewLocalCliMutation,
   recognizeLocalCli,
-  suggestedCustomExtensions,
+  suggestedHarnessExtensions,
+  suggestedSeenExtensions,
   type LocalCliCommandState,
   type LocalCliItem,
   type LocalCliState,
@@ -42,7 +43,9 @@ export function AddCustomExtensionDialog(props: {
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const dialogRef = useModalDialog<HTMLFormElement>(props.onClose, !busy);
-  const suggestions = suggestedCustomExtensions(props.items).slice(0, 6);
+  const recognizeGeneration = useRef(0);
+  const harnessSuggestions = suggestedHarnessExtensions(props.items).slice(0, 8);
+  const seenSuggestions = suggestedSeenExtensions(props.items).slice(0, 4);
 
   useEffect(() => {
     void resolveApprovalGate({ failClosed: true }).catch(() => {
@@ -51,6 +54,7 @@ export function AddCustomExtensionDialog(props: {
   }, [resolveApprovalGate]);
 
   const handleCommand = useCallback((event: ChangeEvent<HTMLInputElement>) => {
+    recognizeGeneration.current += 1;
     setCommand(event.target.value);
     setRecognized(null);
     setCommands([]);
@@ -64,31 +68,45 @@ export function AddCustomExtensionDialog(props: {
   const handleTotp = useCallback((event: ChangeEvent<HTMLInputElement>) => {
     setTotp(event.target.value);
   }, []);
-  const selectSuggestion = useCallback((item: LocalCliItem) => {
-    setCommand(item.example_label);
-    setRecognized(item);
-    setCommands(item.commands);
-    setSummary(suggestionSummary(item));
-    setPending(null);
-    setError(null);
-  }, []);
-  const findTool = useCallback(async () => {
+  const runRecognize = useCallback(async (commandText: string, cliId?: string) => {
+    const generation = recognizeGeneration.current + 1;
+    recognizeGeneration.current = generation;
     setBusy(true);
     setError(null);
     try {
-      const result = await recognizeLocalCli(command);
+      const result = await recognizeLocalCli(commandText, cliId ? { cliId } : undefined);
+      if (recognizeGeneration.current !== generation) return;
       setRecognized(result.item);
       setCommands(result.item.commands);
       setSummary(result.summary);
       setPending(null);
     } catch (caught) {
+      if (recognizeGeneration.current !== generation) return;
       setRecognized(null);
       setSummary(null);
       setError(caught instanceof LocalCliApiError ? caught.message : "Guard could not identify that command.");
     } finally {
-      setBusy(false);
+      if (recognizeGeneration.current === generation) setBusy(false);
     }
-  }, [command]);
+  }, []);
+  const selectSuggestion = useCallback((item: LocalCliItem) => {
+    setCommand(item.example_label);
+    setPending(null);
+    setError(null);
+    if (item.surface === "mcp" && item.commands.length === 0) {
+      setRecognized(null);
+      setCommands([]);
+      setSummary(null);
+      void runRecognize(item.example_label, item.cli_id);
+      return;
+    }
+    setRecognized(item);
+    setCommands(item.commands);
+    setSummary(suggestionSummary(item));
+  }, [runRecognize]);
+  const findTool = useCallback(async () => {
+    await runRecognize(command);
+  }, [command, runRecognize]);
   const requestAllow = useCallback(() => setPending("allowed"), []);
   const requestBlock = useCallback(() => setPending("blocked"), []);
   const handleSubmit = useCallback(async (event: FormEvent) => {
@@ -157,7 +175,7 @@ export function AddCustomExtensionDialog(props: {
       >
         <h2 id="add-custom-extension-title" className="text-xl font-semibold text-brand-dark">Add a custom extension</h2>
         <p className="mt-2 text-sm leading-6 text-brand-dark/80">
-          Paste a local command or an MCP server launch command. Guard lists commands from --help, or tools from a stdio MCP server, then you set Recommended, Allow, or Block.
+          Paste a local command or an MCP server launch command, or pick a server Guard found in your apps. Guard lists commands from --help, or tools from a stdio MCP server, then you set Recommended, Allow, or Block.
         </p>
         <label htmlFor="custom-extension-command" className="mt-5 block text-sm font-semibold text-brand-dark">Command</label>
         <input
@@ -215,17 +233,11 @@ export function AddCustomExtensionDialog(props: {
             />
           </div>
         ) : null}
-        {suggestions.length > 0 && recognized === null ? (
-          <div className="mt-5">
-            <p className="text-sm font-semibold text-brand-dark">Seen on this device</p>
-            <ul className="mt-2 divide-y divide-slate-200">
-              {suggestions.map((item) => (
-                <li key={item.cli_id}>
-                  <SuggestionButton item={item} onSelect={selectSuggestion} />
-                </li>
-              ))}
-            </ul>
-          </div>
+        {recognized === null ? (
+          <>
+            <SuggestionGroup heading="From your apps" items={harnessSuggestions} onSelect={selectSuggestion} />
+            <SuggestionGroup heading="Seen on this device" items={seenSuggestions} onSelect={selectSuggestion} />
+          </>
         ) : null}
         {error ? <div className="mt-4"><InlineError message={error} /></div> : null}
         <div className="mt-6 flex justify-end gap-3">
@@ -270,13 +282,38 @@ function suggestionSummary(item: LocalCliItem): string {
   return `Find this tool to read ${item.name} --help and load its commands.`;
 }
 
+function SuggestionGroup(props: {
+  heading: string;
+  items: LocalCliItem[];
+  onSelect: (item: LocalCliItem) => void;
+}) {
+  if (props.items.length === 0) return null;
+  return (
+    <div className="mt-5">
+      <p className="text-sm font-semibold text-brand-dark">{props.heading}</p>
+      <ul className="mt-2 divide-y divide-slate-200">
+        {props.items.map((item) => (
+          <li key={item.cli_id}>
+            <SuggestionButton item={item} onSelect={props.onSelect} />
+          </li>
+        ))}
+      </ul>
+    </div>
+  );
+}
+
 function SuggestionButton(props: { item: LocalCliItem; onSelect: (item: LocalCliItem) => void }) {
   const handleSelect = useCallback(() => {
     props.onSelect(props.item);
   }, [props]);
   return (
     <button type="button" onClick={handleSelect} className="flex min-h-11 w-full items-baseline justify-between gap-3 py-2 text-left">
-      <span className="truncate text-sm font-semibold text-brand-dark">{props.item.name}</span>
+      <span className="min-w-0">
+        <span className="block truncate text-sm font-semibold text-brand-dark">{props.item.name}</span>
+        {props.item.source_label ? (
+          <span className="block truncate text-xs text-brand-dark/60">{props.item.source_label}</span>
+        ) : null}
+      </span>
       <span className="truncate font-mono text-xs text-brand-dark/60">{props.item.example_label}</span>
     </button>
   );

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/dashboard/src/protection-center/custom-extension-commands.test.ts

@@ -44,6 +44,7 @@ const legacyAllowed: LocalCliItem = {
   help_status: null,
   surface: "cli",
   server_identity_hash: null,
+  source_label: null,
   state: "allowed",
   stale: false,
   grant_revision: 1,

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/dashboard/src/protection-center/local-clis-panel.tsx

@@ -72,7 +72,7 @@ export function CustomExtensionsSection(props: {
         </button>
       </div>
       {added.length === 0 ? (
-        <p className="mt-4 text-sm leading-6 text-brand-dark/75">None yet. Add one by pasting the command you want Guard to watch.</p>
+        <p className="mt-4 text-sm leading-6 text-brand-dark/75">None yet. Add one by pasting the command, or pick an MCP server Guard found in your apps.</p>
       ) : (
         <div className="mt-4">
           {added.map((item) => (
@@ -101,7 +101,7 @@ function CustomExtensionRow(props: { item: LocalCliItem; onOpen: (cliId: string)
     <ProtectionModuleRow
       extensionId={props.item.cli_id}
       name={props.item.name}
-      description={props.item.example_label}
+      description={props.item.source_label ? `${props.item.example_label} · ${props.item.source_label}` : props.item.example_label}
       behavior={customExtensionStateLabel(props.item)}
       custom
       executables={[props.item.name]}

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/docs/guard/local-cli-allowlist.md

@@ -4,7 +4,7 @@ Extensions already cover built-in tools such as Git, npm, and cloud CLIs. Agents
 
 On the Extensions page, choose **Add custom extension** and paste the command for your tool. For a local script or binary, paste something like `python3 <skill-root>/scripts/cwv.py --by url`. Guard binds to that exact file, runs `--help`, and lists the commands it finds.
 
-For an MCP server, paste the same stdio launch command the harness uses, for example `npx -y @modelcontextprotocol/server-github` or `uvx mcp-server-git`. Guard starts that command as a stdio MCP client, lists the tools, then stops the process. You then set **Recommended**, **Allow**, or **Block** on each command or tool, the same way built-in tools work.
+For an MCP server, paste the same stdio launch command the harness uses, for example `npx -y @modelcontextprotocol/server-github` or `uvx mcp-server-git`. Guard also lists stdio MCP servers already configured in your apps under **From your apps**. Choosing one starts that command as a stdio MCP client, lists the tools, then stops the process. You then set **Recommended**, **Allow**, or **Block** on each command or tool, the same way built-in tools work. Guard does not allow tools or start servers until you choose one.
 
 Shell utilities such as `ls` and `grep` are not custom extensions. Built-in catalog tools such as Git stay in All tools.
 

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "plugin-scanner"
-version = "3.0.0a198"
+version = "3.0.0a199"
 description = "Lint, verify, and gate plugin ecosystems for maintainers, CI, and publish workflows."
 readme = "README.md"
 license = "Apache-2.0"

{plugin_scanner-3.0.0a198 → plugin_scanner-3.0.0a199}/pyproject.toml.bak

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hol-guard"
-version = "3.0.0a198"
+version = "3.0.0a199"
 description = "Open-source antivirus and runtime protection for AI agents, tools, MCP servers, plugins, skills, and package installs."
 readme = "README.md"
 license = "Apache-2.0"

plugin_scanner-3.0.0a198/release-metadata/plugin-scanner-v3.0.0a198.toolchain.cdx.json → plugin_scanner-3.0.0a199/release-metadata/plugin-scanner-v3.0.0a199.toolchain.cdx.json

@@ -27,7 +27,7 @@
     "component": {
       "name": "hol-guard-release-toolchain",
       "type": "application",
-      "version": "3.0.0a198"
+      "version": "3.0.0a199"
     }
   },
   "specVersion": "1.6",

plugin_scanner-3.0.0a199/src/codex_plugin_scanner/guard/adapters/harness_mcp_discovery.py

@@ -0,0 +1,259 @@
+"""Read configured stdio MCP servers from detected harnesses."""
+
+from __future__ import annotations
+
+import os
+import shlex
+import subprocess
+from collections.abc import Sequence
+from dataclasses import dataclass
+from pathlib import Path
+
+from ..models import HarnessDetection
+from ..runtime.local_cli_identity import UnlistedCliIdentity
+from ..runtime.mcp_protection import McpServerIdentity
+from .contracts import display_name_for
+from .mcp_servers import ManagedMcpServer, managed_stdio_servers
+
+MAX_DISCOVERED_MCP_SERVERS = 40
+
+
+@dataclass(frozen=True, slots=True)
+class DiscoveredHarnessMcpServer:
+    """One stdio MCP server found in a harness config."""
+
+    identity: UnlistedCliIdentity
+    server_identity: McpServerIdentity
+    source_label: str
+    launch_command: str
+
+
+def discover_harness_mcp_servers(
+    *,
+    home_dir: Path,
+    guard_home: Path,
+    workspace_dir: Path | None = None,
+    detections: Sequence[HarnessDetection] | None = None,
+) -> tuple[DiscoveredHarnessMcpServer, ...]:
+    """Return unique stdio MCP servers from harness configs. Does not probe."""
+
+    loaded = detections if detections is not None else _safe_detections(home_dir, guard_home, workspace_dir)
+    groups: dict[tuple[str, str], _DiscoveryGroup] = {}
+    for detection in loaded:
+        for server in managed_stdio_servers(detection):
+            built = _identity_for(server)
+            if built is None:
+                continue
+            identity, server_identity = built
+            key = (server_identity.command, server_identity.args_hash)
+            label = display_name_for(server.harness)
+            current = groups.get(key)
+            launch_command = _raw_launch_label(server.command, server.args)
+            if current is None:
+                groups[key] = _DiscoveryGroup(
+                    identity=identity,
+                    server_identity=server_identity,
+                    launch_command=launch_command,
+                    labels=[label],
+                    env_key_count=len(server_identity.env_keys),
+                )
+                continue
+            if label not in current.labels:
+                current.labels.append(label)
+            if len(server_identity.env_keys) > current.env_key_count:
+                current.identity = identity
+                current.server_identity = server_identity
+                current.launch_command = launch_command
+                current.env_key_count = len(server_identity.env_keys)
+    ranked = sorted(
+        groups.values(),
+        key=lambda group: (
+            _join_labels(group.labels).lower(),
+            group.identity.name.lower(),
+            group.server_identity.command,
+            group.server_identity.args_hash,
+        ),
+    )
+    return tuple(
+        DiscoveredHarnessMcpServer(
+            identity=group.identity,
+            server_identity=group.server_identity,
+            source_label=_join_labels(group.labels),
+            launch_command=group.launch_command,
+        )
+        for group in ranked[:MAX_DISCOVERED_MCP_SERVERS]
+    )
+
+
+def persist_discovered_harness_mcp_servers(
+    store: object,
+    servers: Sequence[DiscoveredHarnessMcpServer],
+    *,
+    seen_at: str,
+) -> dict[str, str]:
+    """Persist observations and return cli_id to source_label."""
+
+    ensure = getattr(store, "ensure_local_mcp_observation", None)
+    if not callable(ensure):
+        return {}
+    labels: dict[str, str] = {}
+    for server in servers:
+        cli_id = ensure(
+            server.identity,
+            seen_at=seen_at,
+            server_identity_hash=server.server_identity.identity_hash,
+            server_command=server.server_identity.command,
+            server_args_hash=server.server_identity.args_hash,
+        )
+        if isinstance(cli_id, str) and cli_id:
+            labels[cli_id] = server.source_label
+    return labels
+
+
+def discovered_server_for_observation(
+    servers: Sequence[DiscoveredHarnessMcpServer],
+    *,
+    cli_id: str | None = None,
+    server_command: str | None = None,
+    args_hash: str | None = None,
+) -> DiscoveredHarnessMcpServer | None:
+    """Return the live discovered server for a stored observation. Does not persist."""
+
+    for server in servers:
+        if cli_id and server.identity.cli_id == cli_id:
+            return server
+        if (
+            server_command
+            and args_hash
+            and server.server_identity.command == server_command
+            and server.server_identity.args_hash == args_hash
+        ):
+            return server
+    return None
+
+
+def apply_source_labels(items: list[dict[str, object]], labels: dict[str, str]) -> list[dict[str, object]]:
+    """Overlay harness source labels onto listed custom extensions."""
+
+    for item in items:
+        cli_id = item.get("cli_id")
+        if not isinstance(cli_id, str):
+            continue
+        label = labels.get(cli_id)
+        if label:
+            item["source_label"] = label
+    return items
+
+
+@dataclass
+class _DiscoveryGroup:
+    identity: UnlistedCliIdentity
+    server_identity: McpServerIdentity
+    launch_command: str
+    labels: list[str]
+    env_key_count: int
+
+
+def _safe_detections(home_dir: Path, guard_home: Path, workspace_dir: Path | None) -> list[HarnessDetection]:
+    from . import list_adapters
+    from .base import HarnessContext
+
+    context = HarnessContext(home_dir=home_dir, workspace_dir=workspace_dir, guard_home=guard_home)
+    detections: list[HarnessDetection] = []
+    for adapter in list_adapters():
+        try:
+            detections.append(adapter.detect(context))
+        except (OSError, RuntimeError, TypeError, ValueError, KeyError, UnicodeError):
+            continue
+    return detections
+
+
+def _identity_for(server: ManagedMcpServer) -> tuple[UnlistedCliIdentity, McpServerIdentity] | None:
+    server_identity = server.identity
+    if server_identity is None or not server.command.strip():
+        return None
+    name = server.name.strip() or server_identity.package_name or Path(server.command).name or "mcp-server"
+    return (
+        UnlistedCliIdentity(
+            cli_id=f"local-cli.mcp-{server_identity.identity_hash[:8]}",
+            name=name[:120],
+            kind="executable",
+            identity_hash=server_identity.identity_hash,
+            example_label=_launch_label(server.command, server.args),
+        ),
+        server_identity,
+    )
+
+
+def _join_labels(labels: Sequence[str]) -> str:
+    unique = list(dict.fromkeys(label for label in labels if label.strip()))
+    if len(unique) <= 3:
+        return ", ".join(unique)
+    return f"{unique[0]}, {unique[1]}, and {len(unique) - 2} more"
+
+
+def _launch_label(command: str, args: tuple[str, ...]) -> str:
+    return _join_tokens(_redact_launch_tokens((command, *args)))
+
+
+def _raw_launch_label(command: str, args: tuple[str, ...]) -> str:
+    return _join_tokens((command, *args))
+
+
+def _join_tokens(tokens: Sequence[str]) -> str:
+    values = list(tokens)
+    if os.name == "nt":
+        return subprocess.list2cmdline(values)[:160]
+    return shlex.join(values)[:160]
+
+
+_SECRET_FLAG_NAMES = frozenset(
+    {
+        "access-token",
+        "api-key",
+        "apikey",
+        "auth",
+        "authorization",
+        "bearer",
+        "client-secret",
+        "password",
+        "passwd",
+        "secret",
+        "token",
+    }
+)
+
+
+def _redact_launch_tokens(tokens: Sequence[str]) -> list[str]:
+    redacted: list[str] = []
+    hide_next = False
+    for token in tokens:
+        if hide_next:
+            redacted.append("*****")
+            hide_next = False
+            continue
+        key, separator, _value = token.partition("=")
+        if separator and _is_secret_flag(key):
+            redacted.append(f"{key}=*****")
+            continue
+        if token.startswith("-") and _is_secret_flag(token):
+            redacted.append(token)
+            hide_next = True
+            continue
+        redacted.append(_redact_embedded_assignment(token))
+    return redacted
+
+
+def _redact_embedded_assignment(value: str) -> str:
+    lower = value.lower()
+    if any(token in lower for token in ("apikey=", "api_key=", "api-key=", "token=", "secret=")):
+        key, separator, _rest = value.partition("=")
+        return f"{key}{separator}*****" if separator else value
+    return value
+
+
+def _is_secret_flag(value: str) -> bool:
+    name = value.strip().lstrip("-").lower().replace("_", "-")
+    if name in _SECRET_FLAG_NAMES:
+        return True
+    return name.endswith("-token") or name.endswith("-secret") or name.endswith("-password")