@bazilio-san/glm-cc 1.0.17 → 1.0.20

package/bin/glm-config.js

@@ -0,0 +1,118 @@
+#!/usr/bin/env node
+// Config UI + env file generator for @bazilio-san/glm-cc.
+// Invoked only when the user runs:
+//   glm --glm-config | -c  → interactive reconfiguration
+//   glm --glm-show         → print current config
+//   glm --glm-version      → print glm version
+// Or internally by glm.cmd / glm.sh on first launch (--setup) to populate
+// the KEY=VALUE env sidecar file from the JSON config.
+//
+// CRITICAL: this node process must NOT stay alive during `claude` execution.
+// The whole point of 1.0.20 is that glm's entry point is a shell script that
+// sets env vars and tail-calls claude directly, without a Node intermediate
+// process that would break the parent PTY's ConPty session propagation.
+
+import path from 'node:path';
+import os from 'node:os';
+import fs from 'node:fs';
+import readline from 'node:readline';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const pkg = require('../package.json');
+
+const JSON_PATH = path.join(os.homedir(), '.glm-claude-code.json');
+const ENV_PATH = path.join(os.homedir(), '.glm-claude-code.env');
+
+const FIELDS = [
+  { key: 'ANTHROPIC_BASE_URL', label: 'Anthropic Base URL', default: 'https://api.z.ai/api/anthropic' },
+  { key: 'ANTHROPIC_AUTH_TOKEN', label: 'Anthropic Auth Token', default: '' },
+  { key: 'ANTHROPIC_DEFAULT_HAIKU_MODEL', label: 'Default Haiku model', default: 'glm-4.5-air' },
+  { key: 'ANTHROPIC_DEFAULT_SONNET_MODEL', label: 'Default Sonnet model', default: 'glm-5.1' },
+  { key: 'ANTHROPIC_DEFAULT_OPUS_MODEL', label: 'Default Opus model', default: 'glm-5.1' },
+];
+
+function loadJson () {
+  try { return JSON.parse(fs.readFileSync(JSON_PATH, 'utf-8')); } catch { return {}; }
+}
+
+function saveJson (config) {
+  fs.writeFileSync(JSON_PATH, JSON.stringify(config, null, 2), 'utf-8');
+}
+
+function saveEnv (config) {
+  const header = '# Generated by @bazilio-san/glm-cc. Edit via `glm --glm-config`.';
+  const body = FIELDS.map(f => `${f.key}=${config[f.key] ?? ''}`).join('\n');
+  fs.writeFileSync(ENV_PATH, `${header}\n${body}\n`, 'utf-8');
+}
+
+function saveBoth (config) {
+  saveJson(config);
+  saveEnv(config);
+}
+
+function ask (rl, q) {
+  return new Promise(resolve => rl.question(q, resolve));
+}
+
+async function runInteractive (fieldsToAsk) {
+  const config = loadJson();
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  console.log('\nConfiguration (press Enter to keep current value):\n');
+  for (const field of fieldsToAsk) {
+    const current = config[field.key] || field.default;
+    const hint = current ? ` [\x1b[32m${current}\x1b[0m]` : '';
+    const answer = await ask(rl, `${field.label}${hint}: `);
+    config[field.key] = answer.trim() !== '' ? answer.trim() : current;
+  }
+  rl.close();
+  saveBoth(config);
+  console.log(`\nSaved:\n  ${JSON_PATH}\n  ${ENV_PATH}\n`);
+  return config;
+}
+
+function show (config) {
+  console.log(`\nConfig: ${JSON_PATH}`);
+  console.log(`Env:    ${ENV_PATH}\n`);
+  for (const f of FIELDS) {
+    const v = config[f.key];
+    console.log(`  ${f.key} = ${v != null && v !== '' ? v : '(not set)'}`);
+  }
+  console.log('');
+}
+
+async function main () {
+  const args = process.argv.slice(2);
+
+  if (args.includes('--glm-version')) {
+    console.log(`glm v${pkg.version}`);
+    return;
+  }
+  if (args.includes('--glm-show')) {
+    show(loadJson());
+    return;
+  }
+  if (args.includes('--glm-config') || args.includes('-c')) {
+    await runInteractive(FIELDS);
+    return;
+  }
+  if (args.includes('--setup')) {
+    // Invoked by glm.cmd / glm.sh when ~/.glm-claude-code.env is missing.
+    // If JSON exists and is complete → just regenerate .env, no prompts.
+    // Otherwise prompt only for missing fields.
+    const config = loadJson();
+    const missing = FIELDS.filter(f => !config[f.key]);
+    if (missing.length === 0) {
+      saveEnv(config);
+    } else {
+      console.log('Some glm settings are missing. Please fill them in:\n');
+      await runInteractive(missing);
+    }
+    return;
+  }
+
+  // Fallback: invoked directly → treat as full reconfiguration.
+  await runInteractive(FIELDS);
+}
+
+main().catch(err => { console.error(err.message); process.exit(1); });

package/bin/glm.cmd

@@ -0,0 +1,45 @@
+:; SCRIPT="$(readlink -f "$0" 2>/dev/null || echo "$0")"; exec "$(dirname "$SCRIPT")/glm.sh" "$@"
+@echo off
+rem -------------------------------------------------------------------------
+rem glm — launch claude with GLM env vars. Runs as a pure cmd.exe script so
+rem that no intermediate node process sits between the caller (PTY / terminal)
+rem and claude.exe. Critical for parent-PTY scenarios where the ConPty session
+rem must reach claude directly for Ink-based raw-keyboard input to work.
+rem
+rem First line is a bash/batch polyglot:
+rem   bash : `:` = no-op, `;` separator, `exec` replaces shell with glm.sh
+rem   cmd  : `:;` = malformed label, skipped silently
+rem -------------------------------------------------------------------------
+
+set "GLM_ARGS=%*"
+
+rem --- glm-specific flags are delegated to the node helper ----------------
+set "GLM_PAD= %GLM_ARGS% "
+echo.%GLM_PAD%| findstr /I /C:" --glm-config " /C:" --glm-show " /C:" --glm-version " /C:" -c " >nul
+if not errorlevel 1 (
+  node "%~dp0glm-config.js" %*
+  exit /b %errorlevel%
+)
+
+rem --- First-time setup if env file is missing ----------------------------
+set "GLM_ENV_FILE=%USERPROFILE%\.glm-claude-code.env"
+if not exist "%GLM_ENV_FILE%" (
+  node "%~dp0glm-config.js" --setup
+  if errorlevel 1 exit /b 1
+  if not exist "%GLM_ENV_FILE%" (
+    echo glm: setup did not produce %GLM_ENV_FILE% 1>&2
+    exit /b 1
+  )
+)
+
+rem --- Load env vars from KEY=VALUE file ----------------------------------
+rem Note: with `tokens=1,*` the second token is %%L (letter after %%K),
+rem not %%V — `for /f` names extra tokens sequentially by letter.
+for /f "usebackq eol=# tokens=1,* delims==" %%K in ("%GLM_ENV_FILE%") do (
+  set "%%K=%%L"
+)
+
+rem --- Tail-call claude directly. `claude.exe` becomes a child of the
+rem     outer (PTY-attached) cmd.exe process, not of any node intermediate.
+claude %*
+exit /b %errorlevel%

package/bin/glm.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# glm — launch claude with GLM env vars (POSIX/Unix side).
+# Kept as a pure shell script (no node intermediate) so the parent terminal's
+# TTY reaches claude directly. Counterpart of bin/glm.cmd on Windows.
+
+set -e
+
+# Resolve real script dir (follow symlinks — npm links bin -> bin/glm.cmd → .sh via polyglot)
+_glm_src="${BASH_SOURCE[0]:-$0}"
+if command -v readlink >/dev/null 2>&1; then
+  _glm_real="$(readlink -f "$_glm_src" 2>/dev/null || echo "$_glm_src")"
+else
+  _glm_real="$_glm_src"
+fi
+GLM_BIN_DIR="$(cd "$(dirname "$_glm_real")" && pwd)"
+
+GLM_ENV_FILE="${HOME}/.glm-claude-code.env"
+
+# --- glm-specific flags delegate to the node helper -----------------------
+case " $* " in
+  *" --glm-config "*|*" -c "*|*" --glm-show "*|*" --glm-version "*)
+    exec node "${GLM_BIN_DIR}/glm-config.js" "$@"
+    ;;
+esac
+
+# --- First-time setup -----------------------------------------------------
+if [ ! -f "$GLM_ENV_FILE" ]; then
+  node "${GLM_BIN_DIR}/glm-config.js" --setup
+  if [ ! -f "$GLM_ENV_FILE" ]; then
+    echo "glm: setup did not produce $GLM_ENV_FILE" >&2
+    exit 1
+  fi
+fi
+
+# --- Load env vars and tail-call claude -----------------------------------
+set -a
+# shellcheck disable=SC1090
+. "$GLM_ENV_FILE"
+set +a
+
+exec claude "$@"

package/package.json

@@ -1,11 +1,17 @@
 {
   "name": "@bazilio-san/glm-cc",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "CLI tool for running claude with custom GLM configuration",
-  "main": "bin/glm.js",
   "bin": {
-    "glm": "bin/glm.js"
+    "glm": "bin/glm.cmd"
   },
+  "files": [
+    "bin/glm.cmd",
+    "bin/glm.sh",
+    "bin/glm-config.js",
+    "LICENSE",
+    "README.md"
+  ],
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/bin/glm.js

@@ -1,153 +0,0 @@
-#!/usr/bin/env node
-
-import path from 'node:path';
-import os from 'node:os';
-import fs from 'node:fs';
-import { createRequire } from 'node:module';
-
-const require = createRequire(import.meta.url);
-const pkg = require('../package.json');
-import readline from 'node:readline';
-import { spawn } from 'node:child_process';
-
-const CONFIG_FILE = path.join(os.homedir(), '.glm-claude-code.json');
-
-const CONFIG_FIELDS = [
-  {
-    key: 'ANTHROPIC_BASE_URL',
-    label: 'Anthropic Base URL',
-    defaultValue: 'https://api.z.ai/api/anthropic',
-  },
-  {
-    key: 'ANTHROPIC_AUTH_TOKEN',
-    label: 'Anthropic Auth Token',
-    defaultValue: '',
-  },
-  {
-    key: 'ANTHROPIC_DEFAULT_HAIKU_MODEL',
-    label: 'Default Haiku model',
-    defaultValue: 'glm-4.5-air',
-  },
-  {
-    key: 'ANTHROPIC_DEFAULT_SONNET_MODEL',
-    label: 'Default Sonnet model',
-    defaultValue: 'glm-5.1',
-  },
-  {
-    key: 'ANTHROPIC_DEFAULT_OPUS_MODEL',
-    label: 'Default Opus model',
-    defaultValue: 'glm-5.1',
-  },
-];
-
-function loadConfig() {
-  if (!fs.existsSync(CONFIG_FILE)) return {};
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-    return {};
-  }
-}
-
-function saveConfig(config) {
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), 'utf8');
-}
-
-function ask(rl, question) {
-  return new Promise(resolve => rl.question(question, resolve));
-}
-
-async function runConfig(fields) {
-  const config = loadConfig();
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-
-  console.log('\nConfiguration (press Enter to keep current value):\n');
-
-  for (const field of fields) {
-    const current = config[field.key] !== undefined && config[field.key] !== ''
-      ? config[field.key]
-      : field.defaultValue;
-    const hint = current ? ` [\x1b[32m${current}\x1b[0m]` : '';
-    const answer = await ask(rl, `${field.label}${hint}: `);
-    config[field.key] = answer.trim() !== '' ? answer.trim() : current;
-  }
-
-  rl.close();
-  saveConfig(config);
-  console.log(`\nConfig saved: ${CONFIG_FILE}\n`);
-  return config;
-}
-
-function showConfig(config) {
-  const lines = [
-    '',
-    `Config file: ${CONFIG_FILE}`,
-    '',
-    'Current settings:',
-  ];
-  for (const field of CONFIG_FIELDS) {
-    const val = config[field.key] !== undefined && config[field.key] !== ''
-      ? config[field.key]
-      : '(not set)';
-    lines.push(`  ${field.key} = ${val}`);
-  }
-  lines.push('');
-  console.log(lines.join('\n'));
-}
-
-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', args, {
-    env,
-    stdio: 'inherit',
-    shell: process.platform === 'win32',
-  });
-  proc.on('exit', code => process.exit(code ?? 0));
-  proc.on('error', err => {
-    console.error(`Failed to launch claude: ${err.message}`);
-    process.exit(1);
-  });
-}
-
-async function main() {
-  const args = process.argv.slice(2);
-
-  // 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('--glm-show')) {
-    showConfig(loadConfig());
-    return;
-  }
-
-  if (args.includes('--glm-version')) {
-    console.log(`glm v${pkg.version}`);
-    return;
-  }
-
-  let config = loadConfig();
-
-  const missingFields = CONFIG_FIELDS.filter(f => !config[f.key]);
-
-  if (missingFields.length > 0) {
-    console.log('Some settings are missing. Please fill them in:\n');
-    config = await runConfig(missingFields);
-    config = loadConfig();
-  }
-
-  // All arguments are passed through to claude
-  launchClaude(config, args);
-}
-
-main().catch(err => {
-  console.error(err.message);
-  process.exit(1);
-});