@eclipse-glsp/cli 2.7.0-next.20 → 2.7.0-next.22

package/dist/cli.js

@@ -15537,25 +15537,38 @@ var DEFAULT_TARGET_DIR = "examples/workflow-test";
 function generatePlaywrightEnvContent(options) {
   const { dir, discoveredRepos } = options;
   const lines = [];
+  const hasServerNode = discoveredRepos.includes("glsp-server-node");
+  const hasServerJava = discoveredRepos.includes("glsp-server");
+  const hasClient = discoveredRepos.includes("glsp-client");
   lines.push("# Generated by: glsp repo playwright env");
   lines.push("# Regenerate this file after workspace changes.");
   lines.push("");
+  lines.push("# General");
+  lines.push("GLSP_SERVER_PORT=8081");
+  lines.push("GLSP_SERVER_DEBUG=true");
+  lines.push("GLSP_WEBSOCKET_PATH=workflow");
+  if (hasServerNode) {
+    lines.push("GLSP_SERVER_TYPE=node");
+    lines.push("GLSP_SERVER_START_CMD=npx glsp repo server-node start");
+  } else if (hasServerJava) {
+    lines.push("GLSP_SERVER_TYPE=java");
+    lines.push("GLSP_SERVER_START_CMD=npx glsp repo server-java start");
+  } else {
+    lines.push("GLSP_SERVER_TYPE=unknown");
+    lines.push("# GLSP_SERVER_START_CMD=npx glsp repo server-node start");
+  }
+  lines.push("");
   lines.push("# Optional port overrides (uncomment to change defaults)");
-  lines.push("# GLSP_SERVER_PORT=8081");
   lines.push("# STANDALONE_PORT=8082");
   lines.push("# STANDALONE_BROWSER_PORT=8083");
   lines.push("# THEIA_PORT=3000");
   lines.push("");
-  const hasServerNode = discoveredRepos.includes("glsp-server-node");
-  const hasClient = discoveredRepos.includes("glsp-client");
   if (hasServerNode && hasClient) {
     lines.push("# Standalone Node (WebSocket)");
-    lines.push("GLSP_SERVER_START_CMD=glsp repo server-node start");
-    lines.push("STANDALONE_START_CMD=glsp repo client run start -- --external-server --no-open");
+    lines.push("STANDALONE_START_CMD=npx glsp repo client start --external-server --no-open");
   } else {
     lines.push("# Standalone Node (WebSocket) \u2014 missing repos, uncomment when available");
-    lines.push("# GLSP_SERVER_START_CMD=glsp repo server-node start");
-    lines.push("# STANDALONE_START_CMD=glsp repo client run start -- --external-server --no-open");
+    lines.push("# STANDALONE_START_CMD=npx glsp repo client start --external-server --no-open");
   }
   lines.push("");
   if (hasServerNode && hasClient) {
@@ -15563,23 +15576,23 @@ function generatePlaywrightEnvContent(options) {
     const bundleExists = fs20.existsSync(bundlePath);
     lines.push("# Standalone Browser (Web Worker)");
     if (bundleExists) {
-      lines.push(`STANDALONE_BROWSER_START_CMD=glsp repo client run start:browser -- --external-server ${bundlePath} --no-open`);
+      lines.push(`STANDALONE_BROWSER_START_CMD=npx glsp repo client start --browser --external-server ${bundlePath} --no-open`);
     } else {
       LOGGER.warn(`Browser bundle not found at ${bundlePath}. Build glsp-server-node first.`);
-      lines.push(`# STANDALONE_BROWSER_START_CMD=glsp repo client run start:browser -- --external-server ${bundlePath} --no-open`);
+      lines.push(`# STANDALONE_BROWSER_START_CMD=npx glsp repo client start --browser --external-server ${bundlePath} --no-open`);
     }
   } else {
     lines.push("# Standalone Browser (Web Worker) \u2014 missing repos, uncomment when available");
-    lines.push("# STANDALONE_BROWSER_START_CMD=glsp repo client run start:browser -- --external-server <bundle-path> --no-open");
+    lines.push("# STANDALONE_BROWSER_START_CMD=npx glsp repo client start --browser --external-server <bundle-path> --no-open");
   }
   lines.push("");
   const hasTheia = discoveredRepos.includes("glsp-theia-integration");
   if (hasTheia) {
     lines.push("# Theia");
-    lines.push("THEIA_START_CMD=glsp repo theia start");
+    lines.push("THEIA_START_CMD=npx glsp repo theia start");
   } else {
     lines.push("# Theia \u2014 repo not found, uncomment when available");
-    lines.push("# THEIA_START_CMD=glsp repo theia start");
+    lines.push("# THEIA_START_CMD=npx glsp repo theia start");
   }
   lines.push("");
   const hasVscode = discoveredRepos.includes("glsp-vscode-integration");
@@ -15598,28 +15611,10 @@ function generatePlaywrightEnvContent(options) {
     } else {
       lines.push("# VSCODE_VSIX_PATH=<path-to-vsix>");
     }
-    lines.push("");
-    lines.push("# VSCode Web Extension");
-    lines.push(`VSCODE_WEB_VSIX_ID=${WEB_VSIX_ID}`);
-    let webVsixPath;
-    try {
-      webVsixPath = discoverWebVsix(vscodeRepoDir);
-    } catch {
-      LOGGER.warn("Web extension VSIX file not found. Build and package the web extension first.");
-    }
-    if (webVsixPath) {
-      lines.push(`VSCODE_WEB_VSIX_PATH=${webVsixPath}`);
-    } else {
-      lines.push("# VSCODE_WEB_VSIX_PATH=<path-to-web-vsix>");
-    }
   } else {
     lines.push("# VSCode \u2014 repo not found, uncomment when available");
     lines.push(`# VSCODE_VSIX_ID=${VSIX_ID}`);
     lines.push("# VSCODE_VSIX_PATH=<path-to-vsix>");
-    lines.push("");
-    lines.push("# VSCode Web Extension \u2014 repo not found, uncomment when available");
-    lines.push(`# VSCODE_WEB_VSIX_ID=${WEB_VSIX_ID}`);
-    lines.push("# VSCODE_WEB_VSIX_PATH=<path-to-web-vsix>");
   }
   lines.push("");
   return lines.join("\n");
@@ -15649,7 +15644,7 @@ var PlaywrightEnvCommand = baseCommand().name("env").description("Generate a .en
 // src/commands/repo/run.ts
 var path22 = __toESM(require("path"));
 function createScopedRunCommand(repo) {
-  return baseCommand().name("run").allowUnknownOption(true).description(`Run an arbitrary yarn script in ${repo}`).argument("<script>", "The yarn script to run").option("-d, --dir <path>", "Target directory where repos are cloned").option("-v, --verbose", "Verbose output", false).action(async (script, _cmdOptions, thisCmd) => {
+  return baseCommand().name("run").allowUnknownOption(true).allowExcessArguments(true).description(`Run an arbitrary yarn script in ${repo}`).argument("<script>", "The yarn script to run").option("-d, --dir <path>", "Target directory where repos are cloned").option("-v, --verbose", "Verbose output", false).action(async (script, _cmdOptions, thisCmd) => {
     const cli = thisCmd.opts();
     configureRepoEnv(cli);
     const dir = resolveWorkspaceDir(cli.dir);
@@ -15668,24 +15663,30 @@ function discoverJar(repoDir) {
   const targetDir = path23.resolve(repoDir, JAR_TARGET_DIR);
   return discoverNewestFile(JAR_PATTERN, targetDir, `No *-glsp.jar found in ${targetDir}. Run \`glsp repo server build\` first.`);
 }
-var TheiaStartCommand = baseCommand().name("start").description("Start the Theia application for glsp-theia-integration").option("-d, --dir <path>", "Target directory where repos are cloned").option("--electron", "Start electron variant instead of browser", false).option("--debug", "Connect to external GLSP server for debugging", false).option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
+function collectPassthroughArgs(cmd) {
+  const raw = cmd.args;
+  return raw.length > 0 ? ` ${raw.join(" ")}` : "";
+}
+var TheiaStartCommand = baseCommand().name("start").allowUnknownOption(true).allowExcessArguments(true).description("Start the Theia application for glsp-theia-integration").option("-d, --dir <path>", "Target directory where repos are cloned").option("--electron", "Start electron variant instead of browser", false).option("--debug", "Connect to external GLSP server for debugging", false).option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
   const cli = thisCmd.opts();
   configureRepoEnv(cli);
   const dir = resolveWorkspaceDir(cli.dir);
   const repoDir = path23.resolve(dir, "glsp-theia-integration");
   const target = cli.electron ? "electron" : "browser";
   const script = cli.debug ? "start:debug" : "start";
-  await execForeground(`yarn ${target} ${script}`, { cwd: repoDir, verbose: cli.verbose });
+  const passthrough = collectPassthroughArgs(thisCmd);
+  await execForeground(`yarn ${target} ${script}${passthrough}`, { cwd: repoDir, verbose: cli.verbose });
 });
-var ClientStartCommand = baseCommand().name("start").description("Start the standalone example for glsp-client").option("-d, --dir <path>", "Target directory where repos are cloned").option("--browser", "Run in browser-only mode with WebWorker server", false).option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
+var ClientStartCommand = baseCommand().name("start").allowUnknownOption(true).allowExcessArguments(true).description("Start the standalone example for glsp-client").option("-d, --dir <path>", "Target directory where repos are cloned").option("--browser", "Run in browser-only mode with WebWorker server", false).option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
   const cli = thisCmd.opts();
   configureRepoEnv(cli);
   const dir = resolveWorkspaceDir(cli.dir);
   const repoDir = path23.resolve(dir, "glsp-client");
   const script = cli.browser ? "start:browser" : "start";
-  await execForeground(`yarn ${script}`, { cwd: repoDir, verbose: cli.verbose });
+  const passthrough = collectPassthroughArgs(thisCmd);
+  await execForeground(`yarn ${script}${passthrough}`, { cwd: repoDir, verbose: cli.verbose });
 });
-var ServerStartCommand = baseCommand().name("start").description("Start the glsp-server Java GLSP server").option("-d, --dir <path>", "Target directory where repos are cloned").option("-p, --port <port>", "Port to start the server on").option("--socket", "Use socket connection instead of websocket", false).option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
+var ServerStartCommand = baseCommand().name("start").allowUnknownOption(true).allowExcessArguments(true).description("Start the glsp-server Java GLSP server").option("-d, --dir <path>", "Target directory where repos are cloned").option("-p, --port <port>", "Port to start the server on").option("--socket", "Use socket connection instead of websocket", false).option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
   const cli = thisCmd.opts();
   configureRepoEnv(cli);
   const dir = resolveWorkspaceDir(cli.dir);
@@ -15695,16 +15696,18 @@ var ServerStartCommand = baseCommand().name("start").description("Start the glsp
   const socketPort = cli.port ?? 5007;
   const wsPort = cli.port ?? 8081;
   const javaCmd = cli.socket ? `java -jar ${jarPath} --port=${socketPort}` : `java -jar ${jarPath} --websocket --port=${wsPort}`;
-  await execForeground(javaCmd, { cwd: repoDir, verbose: cli.verbose });
+  const passthrough = collectPassthroughArgs(thisCmd);
+  await execForeground(`${javaCmd}${passthrough}`, { cwd: repoDir, verbose: cli.verbose });
 });
-var ServerNodeStartCommand = baseCommand().name("start").description("Start the glsp-server-node GLSP server").option("-d, --dir <path>", "Target directory where repos are cloned").option("-p, --port <port>", "Port to start the server on").option("--socket", "Use socket connection instead of websocket", false).option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
+var ServerNodeStartCommand = baseCommand().name("start").allowUnknownOption(true).allowExcessArguments(true).description("Start the glsp-server-node GLSP server").option("-d, --dir <path>", "Target directory where repos are cloned").option("-p, --port <port>", "Port to start the server on").option("--socket", "Use socket connection instead of websocket", false).option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
   const cli = thisCmd.opts();
   configureRepoEnv(cli);
   const dir = resolveWorkspaceDir(cli.dir);
   const repoDir = path23.resolve(dir, "glsp-server-node");
   const yarnCmd = cli.socket ? "yarn start" : "yarn start:websocket";
   const portArg = cli.port ? ` --port ${cli.port}` : "";
-  await execForeground(`${yarnCmd}${portArg}`, { cwd: repoDir, verbose: cli.verbose });
+  const passthrough = collectPassthroughArgs(thisCmd);
+  await execForeground(`${yarnCmd}${portArg}${passthrough}`, { cwd: repoDir, verbose: cli.verbose });
 });
 
 // src/commands/repo/switch.ts
@@ -15818,6 +15821,12 @@ function createSubrepoCommand(repo) {
       cmd.addCommand(extraCmd);
     }
   }
+  cmd.hook("preSubcommand", (_, subcommand) => {
+    const parentDir = cmd.getOptionValue("dir");
+    if (parentDir && !subcommand.getOptionValue("dir")) {
+      subcommand.setOptionValue("dir", parentDir);
+    }
+  });
   const alias = SHORT_ALIASES[repo];
   if (alias) {
     cmd.alias(alias);
@@ -15947,7 +15956,13 @@ Run "glsp repo workspace init" first.`);
 var WorkspaceCommand = baseCommand().name("workspace").description("Manage VS Code workspace files for GLSP projects").addCommand(WorkspaceInitCommand).addCommand(WorkspaceOpenCommand);
 
 // src/commands/repo/repo.ts
-var RepoCommand = baseCommand().name("repo").description("Multi-repository management for GLSP projects").addCommand(CloneCommand).addCommand(ForkCommand).addCommand(BuildCommand).addCommand(LinkCommand).addCommand(UnlinkCommand).addCommand(PwdCommand).addCommand(LogCommand).addCommand(WorkspaceCommand);
+var RepoCommand = baseCommand().name("repo").description("Multi-repository management for GLSP projects").option("-d, --dir <path>", "Target directory where repos are cloned (inherited by subcommands)").addCommand(CloneCommand).addCommand(ForkCommand).addCommand(BuildCommand).addCommand(LinkCommand).addCommand(UnlinkCommand).addCommand(PwdCommand).addCommand(LogCommand).addCommand(WorkspaceCommand);
+RepoCommand.hook("preSubcommand", (_, subcommand) => {
+  const parentDir = RepoCommand.opts().dir;
+  if (parentDir && !subcommand.getOptionValue("dir")) {
+    subcommand.setOptionValue("dir", parentDir);
+  }
+});
 for (const repo of GLSPRepo.choices) {
   RepoCommand.addCommand(createSubrepoCommand(repo));
 }