@bazilio-san/glm-cc 1.0.16 → 1.0.19

package/README.md

@@ -10,23 +10,23 @@ npm install -g @bazilio-san/glm-cc
 
 ## Usage
 
-### Start claude with your configuration
-```bash
-glm
-```
+All arguments are passed through to `claude`, so you can use `glm` as a drop-in replacement:
 
-### Interactive configuration
 ```bash
-glm -c
-# or
-glm --config
+glm                        # launch claude interactively
+glm -h                     # claude -h
+glm plugin -h              # claude plugin -h
+glm -p "hello"             # claude -p "hello"
+glm --version              # claude --version
+glm mcp serve              # claude mcp serve
 ```
 
-### Show help and current settings
+### glm-specific commands
+
 ```bash
-glm -h
-# or
-glm --help
+glm -c                     # interactive configuration (alias: --glm-config)
+glm --glm-show             # show current settings
+glm --glm-version          # show glm version
 ```
 
 ## Configuration

package/bin/glm.js

@@ -78,16 +78,8 @@ async function runConfig(fields) {
   return config;
 }
 
-function showHelp(config) {
+function showConfig(config) {
   const lines = [
-    '',
-    'Usage: glm [options]',
-    '',
-    'Options:',
-    '  -c, --config    Interactive configuration',
-    '  -h, --help      Show this help',
-    '',
-    'Without options: applies config to environment and launches claude.',
     '',
     `Config file: ${CONFIG_FILE}`,
     '',
@@ -103,18 +95,76 @@ function showHelp(config) {
   console.log(lines.join('\n'));
 }
 
-function launchClaude(config) {
+// Resolve `claude` into { cmd, args, useShell } without an extra cmd.exe
+// layer on Windows. A nested cmd.exe breaks ConPty stdin for Ink-based TUIs
+// (e.g. when glm is spawned via node-pty from a test harness).
+function resolveClaude() {
+  if (process.platform !== 'win32') {
+    return { cmd: 'claude', prefix: [], useShell: false };
+  }
+
+  const pathExts = (process.env.PATHEXT || '.COM;.EXE;.BAT;.CMD')
+    .split(';').map(e => e.toLowerCase()).filter(Boolean);
+  const pathDirs = (process.env.PATH || '').split(path.delimiter).filter(Boolean);
+
+  let exePath = null;
+  let cmdPath = null;
+  for (const dir of pathDirs) {
+    for (const ext of pathExts) {
+      const full = path.join(dir, 'claude' + ext);
+      if (!fs.existsSync(full)) continue;
+      if (ext === '.exe' && !exePath) exePath = full;
+      else if ((ext === '.cmd' || ext === '.bat') && !cmdPath) cmdPath = full;
+    }
+    if (exePath) break;
+  }
+
+  // Prefer native .exe — spawn directly, no shell layer.
+  if (exePath) {
+    return { cmd: exePath, prefix: [], useShell: false };
+  }
+
+  // npm shim on Windows looks like:
+  //   @"C:\Program Files\nodejs\node.exe" "...\cli.js" %*
+  // Parse it and spawn node directly so we skip the shim's cmd.exe.
+  if (cmdPath) {
+    try {
+      const shim = fs.readFileSync(cmdPath, 'utf8');
+      const m = shim.match(/"([^"]+\\node\.exe)"\s+"([^"]+\.(?:js|mjs|cjs))"/i);
+      if (m) {
+        return { cmd: m[1], prefix: [m[2]], useShell: false };
+      }
+    } catch { /* fall through */ }
+    // Can't parse — must go through shell for .cmd execution.
+    return { cmd: cmdPath, prefix: [], useShell: true };
+  }
+
+  // Nothing found — let cmd.exe resolve at runtime (legacy behavior).
+  return { cmd: 'claude', prefix: [], useShell: true };
+}
+
+function launchClaude(config, args) {
   const env = { ...process.env };
   for (const field of CONFIG_FIELDS) {
     if (config[field.key]) {
       env[field.key] = config[field.key];
     }
   }
-  const proc = spawn('claude', [], {
+
+  const { cmd, prefix, useShell } = resolveClaude();
+  const proc = spawn(cmd, [...prefix, ...args], {
     env,
     stdio: 'inherit',
-    shell: process.platform === 'win32',
+    shell: useShell,
   });
+
+  const signals = ['SIGINT', 'SIGTERM', 'SIGHUP', 'SIGBREAK'];
+  for (const sig of signals) {
+    process.on(sig, () => {
+      try { proc.kill(sig); } catch { /* */ }
+    });
+  }
+
   proc.on('exit', code => process.exit(code ?? 0));
   proc.on('error', err => {
     console.error(`Failed to launch claude: ${err.message}`);
@@ -125,18 +175,19 @@ function launchClaude(config) {
 async function main() {
   const args = process.argv.slice(2);
 
-  if (args.includes('-v') || args.includes('-V') || args.includes('--version') || args.includes('-version')) {
-    console.log(pkg.version);
+  // Only glm-specific flags: --config, --show-config, --glm-version
+  if (args.includes('--glm-config') || args.includes('-c')) {
+    await runConfig(CONFIG_FIELDS);
     return;
   }
 
-  if (args.includes('-h') || args.includes('--help')) {
-    showHelp(loadConfig());
+  if (args.includes('--glm-show')) {
+    showConfig(loadConfig());
     return;
   }
 
-  if (args.includes('-c') || args.includes('--config')) {
-    await runConfig(CONFIG_FIELDS);
+  if (args.includes('--glm-version')) {
+    console.log(`glm v${pkg.version}`);
     return;
   }
 
@@ -150,7 +201,8 @@ async function main() {
     config = loadConfig();
   }
 
-  launchClaude(config);
+  // All arguments are passed through to claude
+  launchClaude(config, args);
 }
 
 main().catch(err => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bazilio-san/glm-cc",
-  "version": "1.0.16",
+  "version": "1.0.19",
   "description": "CLI tool for running claude with custom GLM configuration",
   "main": "bin/glm.js",
   "bin": {