@agentprojectcontext/apx 1.53.2 → 1.53.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,7 +18,7 @@
18
18
  <link rel="apple-touch-icon" href="/favicon/dark/apple-touch-icon.png" media="(prefers-color-scheme: dark)" />
19
19
  <link rel="manifest" href="/favicon/white/site.webmanifest" media="(prefers-color-scheme: light)" />
20
20
  <link rel="manifest" href="/favicon/dark/site.webmanifest" media="(prefers-color-scheme: dark)" />
21
- <script type="module" crossorigin src="/assets/index-vuz4PKLd.js"></script>
21
+ <script type="module" crossorigin src="/assets/index-Cy355-jV.js"></script>
22
22
  <link rel="stylesheet" crossorigin href="/assets/index-BwnMDZaD.css">
23
23
  </head>
24
24
  <body class="bg-background text-foreground antialiased">
@@ -543,6 +543,7 @@ export const en = {
543
543
  new: "MCP",
544
544
  delete_confirm: "Delete MCP {name} from scope {scope}?",
545
545
  conflicts: "⚠ Conflicts: {names}",
546
+ conflict_detail: "{name} is defined in {winner} and {loser}. APX uses {winner}; {loser} is ignored.",
546
547
  new_title: "New MCP",
547
548
  new_desc: "POST /projects/:pid/mcps?scope=…",
548
549
  scope_label: "Scope",
@@ -583,6 +584,14 @@ export const en = {
583
584
  scope_runtime: "Runtime",
584
585
  scope_shared: "Shared",
585
586
  scope_global: "Global",
587
+ source_runtime: "Runtime",
588
+ source_apc: "APC / Shared",
589
+ source_claude: "Claude",
590
+ source_codex: "Codex",
591
+ source_cursor: "Cursor",
592
+ source_vscode: "VS Code",
593
+ source_roo: "Roo",
594
+ source_gemini: "Gemini",
586
595
  scope_runtime_desc: "This project only · with secrets · not committed (~/.apx/projects/<id>/mcps.json)",
587
596
  scope_shared_desc: "This project only · committeable · no secrets (.apc/mcps.json)",
588
597
  scope_global_desc: "All projects on this machine (~/.apx/mcps.json)",
@@ -544,6 +544,7 @@ export const es = {
544
544
  new: "MCP",
545
545
  delete_confirm: "Borrar MCP {name} de scope {scope}?",
546
546
  conflicts: "⚠ Conflictos: {names}",
547
+ conflict_detail: "{name} está definido en {winner} y {loser}. Se usa {winner}; {loser} queda ignorado.",
547
548
  new_title: "Nuevo MCP",
548
549
  edit_title: "Editar MCP",
549
550
  new_desc: "Se guarda según el scope elegido. Los valores con ${var.X} se resuelven al arrancar el MCP.",
@@ -551,6 +552,14 @@ export const es = {
551
552
  scope_runtime: "Runtime",
552
553
  scope_shared: "Shared",
553
554
  scope_global: "Global",
555
+ source_runtime: "Runtime",
556
+ source_apc: "APC / Shared",
557
+ source_claude: "Claude",
558
+ source_codex: "Codex",
559
+ source_cursor: "Cursor",
560
+ source_vscode: "VS Code",
561
+ source_roo: "Roo",
562
+ source_gemini: "Gemini",
554
563
  scope_runtime_desc: "Solo este proyecto · con secrets · no se commitea (~/.apx/projects/<id>/mcps.json)",
555
564
  scope_shared_desc: "Solo este proyecto · committeable · sin secrets (.apc/mcps.json)",
556
565
  scope_global_desc: "Todos los proyectos de esta máquina (~/.apx/mcps.json)",
@@ -6,7 +6,7 @@ export type McpScope = "shared" | "runtime" | "global";
6
6
  export interface McpCheck {
7
7
  sources: Array<{ name: string; path: string }>;
8
8
  entries: McpEntry[];
9
- conflicts: Array<{ name: string; sources: string[] }>;
9
+ conflicts: Array<{ name: string; winner: string; loser: string }>;
10
10
  }
11
11
 
12
12
  export interface McpAddBody {
@@ -32,8 +32,14 @@ function sourceToScope(source: string): McpScope {
32
32
  }
33
33
 
34
34
  function sourceLabel(source: string): string {
35
- if (source === "apc") return t("project.mcps.scope_shared");
36
- if (source === "runtime") return t("project.mcps.scope_runtime");
35
+ if (source === "runtime") return t("project.mcps.source_runtime");
36
+ if (source === "apc") return t("project.mcps.source_apc");
37
+ if (source === "claude") return t("project.mcps.source_claude");
38
+ if (source === "codex") return t("project.mcps.source_codex");
39
+ if (source === "cursor") return t("project.mcps.source_cursor");
40
+ if (source === "vscode") return t("project.mcps.source_vscode");
41
+ if (source === "roo") return t("project.mcps.source_roo");
42
+ if (source === "gemini") return t("project.mcps.source_gemini");
37
43
  if (source === "global") return t("project.mcps.scope_global");
38
44
  return source;
39
45
  }
@@ -88,7 +94,23 @@ export function McpsTab({ pid }: { pid: string }) {
88
94
  >
89
95
  {conflicts.data?.conflicts?.length ? (
90
96
  <div className="mb-3 rounded-md border border-amber-500/40 bg-amber-500/10 p-2 text-xs">
91
- {t("project.mcps.conflicts", { names: conflicts.data.conflicts.map((c: any) => c.name).join(", ") })}
97
+ <div className="font-medium">
98
+ {t("project.mcps.conflicts", { names: conflicts.data.conflicts.map((c) => c.name).join(", ") })}
99
+ </div>
100
+ <ul className="mt-1 space-y-1 text-muted-fg">
101
+ {conflicts.data.conflicts.map((c) => (
102
+ <li key={`${c.name}-${c.winner}-${c.loser}`} className="flex gap-2">
103
+ <span aria-hidden="true">•</span>
104
+ <span>
105
+ {t("project.mcps.conflict_detail", {
106
+ name: c.name,
107
+ winner: sourceLabel(c.winner),
108
+ loser: sourceLabel(c.loser),
109
+ })}
110
+ </span>
111
+ </li>
112
+ ))}
113
+ </ul>
92
114
  </div>
93
115
  ) : null}
94
116