Remove redundant --uri options from plugin and theme commands

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: ruibaby

skills/halo-cli-operations/SKILL.md

@@ -45,7 +45,7 @@ Rules:
 
 - `theme list` marks the active theme in table output.
 - Local theme install uses `--file`.
-- `theme install --url|--uri` and `theme upgrade --url|--uri` prompt for confirmation when the remote host is not `www.halo.run`; use `--yes` to bypass that prompt in automation or other non-interactive runs.
+- `theme install --url` and `theme upgrade --url` prompt for confirmation when the remote host is not `www.halo.run`; use `--yes` to bypass that prompt in automation or other non-interactive runs.
 - `upgrade --all` is for App Store-aware upgrades, not direct `--file` or `--url` sources.
 
 ## Plugins
@@ -65,7 +65,7 @@ halo plugin uninstall <name> --force
 Rules:
 
 - Plugin upgrades can use App Store-aware logic.
-- `plugin install --url|--uri` and `plugin upgrade --url|--uri` prompt for confirmation when the remote host is not `www.halo.run`; use `--yes` to bypass that prompt in automation or other non-interactive runs.
+- `plugin install --url` and `plugin upgrade --url` prompt for confirmation when the remote host is not `www.halo.run`; use `--yes` to bypass that prompt in automation or other non-interactive runs.
 - Treat `disable`, `upgrade`, and `uninstall` as mutating operations.
 
 ## Attachments

src/commands/plugin/__test__/plugin-entry.spec.ts

@@ -609,6 +609,13 @@ test("tryRunPluginCommand rejects unknown install flags during parsing", async (
   await expect(
     tryRunPluginCommand(["plugin", "install", "--online"], runtimeMock as never),
   ).rejects.toThrow(/Unknown option `--online`/i);
+
+  await expect(
+    tryRunPluginCommand(
+      ["plugin", "install", "--uri", "https://example.com/plugin.jar"],
+      runtimeMock as never,
+    ),
+  ).rejects.toThrow(/Unknown option `--uri`/i);
 });
 
 test("tryRunPluginCommand rejects invalid --all combinations", async () => {

src/commands/plugin/__test__/plugin.spec.ts

@@ -20,13 +20,6 @@ test("resolvePluginInstallSource accepts urls", () => {
   });
 });
 
-test("resolvePluginInstallSource accepts uri aliases", () => {
-  expect(resolvePluginInstallSource({ uri: " https://example.com/plugin.jar " })).toEqual({
-    url: "https://example.com/plugin.jar",
-    file: undefined,
-  });
-});
-
 test("resolvePluginInstallSource accepts files", () => {
   expect(resolvePluginInstallSource({ file: " ./plugin.jar " })).toEqual({
     url: undefined,

src/commands/plugin/index.ts

@@ -31,7 +31,6 @@ interface PluginCommandOptions {
   keyword?: string;
   enabled?: string;
   url?: string;
-  uri?: string;
   file?: string;
   online?: boolean;
   all?: boolean;
@@ -89,9 +88,9 @@ export function resolvePluginUpgradeTarget(
       throw new CliError("`halo plugin upgrade --all` does not accept a plugin name.");
     }
 
-    if (options.url || options.uri || options.file) {
+    if (options.url || options.file) {
       throw new CliError(
-        "`halo plugin upgrade --all` only supports App Store upgrades. Do not combine it with --url, --uri, or --file.",
+        "`halo plugin upgrade --all` only supports App Store upgrades. Do not combine it with --url or --file.",
       );
     }
 
@@ -195,7 +194,7 @@ export function resolvePluginInstallSource(options: PluginCommandOptions): {
   url?: string;
   file?: string;
 } {
-  const url = options.url?.trim() || options.uri?.trim();
+  const url = options.url?.trim();
   const file = options.file?.trim();
 
   if (!url && !file) {
@@ -669,7 +668,6 @@ function buildPluginCli(runtime: RuntimeContext): CAC {
     .option("--profile <name>", "Halo profile name")
     .option("--json", "Output JSON")
     .option("--url <url>", "Remote JAR URL")
-    .option("--uri <uri>", "Remote JAR URI")
     .option("--file <path>", "Local JAR file path")
     .option("-y, --yes", "Skip third-party URL confirmation")
     .action(async (options: PluginCommandOptions) => {
@@ -714,7 +712,6 @@ function buildPluginCli(runtime: RuntimeContext): CAC {
     .option("--profile <name>", "Halo profile name")
     .option("--json", "Output JSON")
     .option("--url <url>", "Remote JAR URL")
-    .option("--uri <uri>", "Remote JAR URI")
     .option("--file <path>", "Local JAR file path")
     .option("--online", "Upgrade from the Halo App Store")
     .option("--all", "Upgrade all compatible App Store plugins")
@@ -820,7 +817,6 @@ function buildPluginCli(runtime: RuntimeContext): CAC {
   pluginCli.example((bin) => `${bin} enable PluginName --force`);
   pluginCli.example((bin) => `${bin} disable PluginName --force`);
   pluginCli.example((bin) => `${bin} uninstall PluginName --force`);
-  pluginCli.example((bin) => `${bin} install --uri file:///tmp/example.jar`);
   pluginCli.example((bin) => `${bin} install --url https://example.com/plugin.jar`);
   pluginCli.example((bin) => `${bin} upgrade PluginName --online`);
   pluginCli.example((bin) => `${bin} upgrade --all --online --yes`);

src/commands/theme/__test__/theme-entry.spec.ts

@@ -286,6 +286,13 @@ test("tryRunThemeCommand rejects unknown online install flags during parsing", a
   await expect(
     tryRunThemeCommand(["theme", "install", "--online"], runtimeMock as never),
   ).rejects.toThrow(/Unknown option `--online`/i);
+
+  await expect(
+    tryRunThemeCommand(
+      ["theme", "install", "--uri", "https://example.com/theme.zip"],
+      runtimeMock as never,
+    ),
+  ).rejects.toThrow(/Unknown option `--uri`/i);
 });
 
 test("tryRunThemeCommand dispatches activate subcommands", async () => {

src/commands/theme/__test__/theme.spec.ts

@@ -20,13 +20,6 @@ test("resolveThemeInstallSource accepts urls", () => {
   });
 });
 
-test("resolveThemeInstallSource accepts uri aliases", () => {
-  expect(resolveThemeInstallSource({ uri: " https://example.com/theme.zip " })).toEqual({
-    url: "https://example.com/theme.zip",
-    file: undefined,
-  });
-});
-
 test("resolveThemeInstallSource accepts files", () => {
   expect(resolveThemeInstallSource({ file: " ./theme.zip " })).toEqual({
     url: undefined,

src/commands/theme/index.ts

@@ -26,7 +26,6 @@ interface ThemeCommandOptions {
   page?: string;
   size?: string;
   url?: string;
-  uri?: string;
   file?: string;
   online?: boolean;
   all?: boolean;
@@ -187,7 +186,7 @@ export function resolveThemeInstallSource(options: ThemeCommandOptions): {
   url?: string;
   file?: string;
 } {
-  const url = options.url?.trim() || options.uri?.trim();
+  const url = options.url?.trim();
   const file = options.file?.trim();
 
   if (!url && !file) {
@@ -210,9 +209,9 @@ function resolveThemeUpgradeTarget(
       throw new CliError("`halo theme upgrade --all` does not accept a theme name.");
     }
 
-    if (options.url || options.uri || options.file) {
+    if (options.url || options.file) {
       throw new CliError(
-        "`halo theme upgrade --all` only supports App Store upgrades. Do not combine it with --url, --uri, or --file.",
+        "`halo theme upgrade --all` only supports App Store upgrades. Do not combine it with --url or --file.",
       );
     }
 
@@ -591,7 +590,6 @@ function buildThemeCli(runtime: RuntimeContext): CAC {
     .option("--profile <name>", "Halo profile name")
     .option("--json", "Output JSON")
     .option("--url <url>", "Remote ZIP URL")
-    .option("--uri <uri>", "Remote ZIP URI")
     .option("--file <path>", "Local ZIP file path")
     .option("-y, --yes", "Skip third-party URL confirmation")
     .action(async (options: ThemeCommandOptions) => {
@@ -641,7 +639,6 @@ function buildThemeCli(runtime: RuntimeContext): CAC {
     .option("--profile <name>", "Halo profile name")
     .option("--json", "Output JSON")
     .option("--url <url>", "Remote ZIP URL")
-    .option("--uri <uri>", "Remote ZIP URI")
     .option("--file <path>", "Local ZIP file path")
     .option("--online", "Upgrade from the Halo App Store")
     .option("--all", "Upgrade all compatible App Store themes")
@@ -801,7 +798,7 @@ function buildThemeCli(runtime: RuntimeContext): CAC {
   themeCli.example((bin) => `${bin} list`);
   themeCli.example((bin) => `${bin} get ThemeName`);
   themeCli.example((bin) => `${bin} current`);
-  themeCli.example((bin) => `${bin} install --uri file:///tmp/example.zip`);
+  themeCli.example((bin) => `${bin} install --url https://example.com/theme.zip`);
   themeCli.example((bin) => `${bin} install --url https://example.com/theme.zip`);
   themeCli.example((bin) => `${bin} upgrade ThemeName --online`);
   themeCli.example((bin) => `${bin} activate ThemeName`);

src/shared/integrations/__test__/app-store.spec.ts

@@ -33,13 +33,6 @@ test("resolvePluginUpgradeSource accepts url source", () => {
   });
 });
 
-test("resolvePluginUpgradeSource accepts uri alias", () => {
-  expect(resolvePluginUpgradeSource({ uri: "https://example.com/plugin.jar" })).toEqual({
-    kind: "url",
-    url: "https://example.com/plugin.jar",
-  });
-});
-
 test("resolvePluginUpgradeSource accepts file source", () => {
   expect(resolvePluginUpgradeSource({ file: "./plugin.jar" })).toEqual({
     kind: "file",

src/shared/integrations/app-store.ts

@@ -104,7 +104,6 @@ interface HaloProActivation {
 
 export interface PluginUpgradeSourceOptions {
   url?: string;
-  uri?: string;
   file?: string;
   online?: boolean;
 }
@@ -135,7 +134,7 @@ async function withTimeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T
 export function resolvePluginUpgradeSource(
   options: PluginUpgradeSourceOptions,
 ): PluginUpgradeSource {
-  const url = options.url?.trim() || options.uri?.trim();
+  const url = options.url?.trim();
   const file = options.file?.trim();
   const online = Boolean(options.online);
   const sourceCount = Number(Boolean(url)) + Number(Boolean(file)) + Number(online);