opencode-glm-quota 1.3.0 → 1.3.2

package/README.md

@@ -21,22 +21,37 @@ OpenCode plugin to query Z.ai GLM Coding Plan usage statistics with real-time qu
 ### Option 1: npm (Recommended)
 
 ```bash
-# Install the plugin
-npm install @opencode-glm-quota/plugin
+# Install plugin
+npm install opencode-glm-quota
 
-# Run the installer to configure OpenCode
-npx @opencode-glm-quota/plugin install
-
-# Add to your OpenCode config (~/.config/opencode/opencode.json)
-echo '"@opencode-glm-quota/plugin"' >> ~/.config/opencode/opencode.json
+# Run installer to configure OpenCode
+npx opencode-glm-quota install
 ```
 
 **What the installer does:**
 - Copies `/glm_quota` command to `~/.config/opencode/command/glm_quota.md`
-- Copies skill documentation to `~/.config/opencode/skill/glm-quota-skill.md`
+- Copies skill documentation to `~/.config/opencode/skills/glm-quota/SKILL.md`
+- Automatically adds plugin to your OpenCode config
 - Merges agent configuration into `~/.config/opencode/opencode.json`
 - Supports `--force` flag to overwrite existing files
 
+### Uninstall
+
+```bash
+# Remove OpenCode integration files and config
+npx opencode-glm-quota uninstall
+
+# If installed globally
+npx opencode-glm-quota uninstall --global
+```
+
+**What the uninstaller does:**
+- Removes `/glm_quota` command
+- Deletes `skills/glm-quota/SKILL.md`
+- Removes plugin entry from OpenCode config
+- Removes `glm-quota-exec` agent config
+- Runs `npm remove opencode-glm-quota` (or `--global`)
+
 ### Option 2: From GitHub
 
 ```bash
@@ -227,7 +242,7 @@ npm run prepublishOnly
 
 ```
 src/
-  index.ts              # Main plugin entry point (463 lines)
+  index.ts              # Main plugin entry point
   api/
     client.ts           # HTTPS client with timeout and error handling
     endpoints.ts        # Platform-specific API endpoints
@@ -236,16 +251,16 @@ src/
     date-formatter.ts   # Date/time formatting utilities
     progress-bar.ts     # ASCII progress bar rendering
     time-window.ts      # Rolling window calculation
-integration/
-  command/glm_quota.md          # /glm_quota slash command
-  skill/glm-quota-skill.md      # Skill documentation
-  opencode.jsonc                # Agent configuration (JSONC)
-bin/
-  install.js                     # Installation script
-dist/                   # Compiled JavaScript (generated)
-tests/                  # Test suite
-package.json            # Dependencies and scripts
-tsconfig.json           # TypeScript configuration
+  integration/
+    command/glm_quota.md          # /glm_quota slash command
+    skills/glm-quota/SKILL.md      # Skill documentation
+    opencode.jsonc                # Agent configuration (JSONC)
+  bin/
+    install.js                     # Installation script
+  dist/                   # Compiled JavaScript (generated)
+  tests/                  # Test suite
+  package.json            # Dependencies and scripts
+  tsconfig.json           # TypeScript configuration
 ```
 
 ### Code Style Guidelines

package/bin/install.js

@@ -9,11 +9,13 @@
  * Usage:
  *   node bin/install.js              # Interactive install (ask before overwriting)
  *   node bin/install.js --force      # Force overwrite existing files
+ *   node bin/install.js uninstall    # Remove integration files and config
  */
 
 import * as fs from 'fs'
 import * as path from 'path'
 import * as os from 'os'
+import { spawnSync } from 'child_process'
 import { parse as parseJsonc } from 'jsonc-parser'
 
 // ==========================================
@@ -24,12 +26,12 @@ const __filename = decodeURIComponent(new URL(import.meta.url).pathname)
 const __dirname = path.dirname(__filename)
 const SOURCE_DIR = path.join(__dirname, '..', 'integration')
 const COMMAND_FILE = path.join(SOURCE_DIR, 'command', 'glm_quota.md')
-const SKILL_FILE = path.join(SOURCE_DIR, 'skill', 'glm-quota-skill.md')
+const SKILL_FILE = path.join(SOURCE_DIR, 'skills', 'glm-quota', 'SKILL.md')
 const AGENT_CONFIG = path.join(SOURCE_DIR, 'opencode.jsonc')
 
 const CONFIG_DIR = path.join(os.homedir(), '.config', 'opencode')
 const TARGET_COMMAND = path.join(CONFIG_DIR, 'command', 'glm_quota.md')
-const TARGET_SKILL = path.join(CONFIG_DIR, 'skill', 'glm-quota-skill.md')
+const TARGET_SKILL = path.join(CONFIG_DIR, 'skills', 'glm-quota', 'SKILL.md')
 
 // Check which config file exists (opencode.json or opencode.jsonc)
 const TARGET_CONFIG_JSON = path.join(CONFIG_DIR, 'opencode.json')
@@ -72,6 +74,30 @@ function copyFile(source, destination) {
   fs.copyFileSync(source, destination)
 }
 
+/**
+ * Remove file if it exists
+ */
+function removeFile(filePath, label) {
+  if (fileExists(filePath)) {
+    fs.unlinkSync(filePath)
+    console.log(`  ✓ Removed ${label}`)
+  } else {
+    console.log(`  ⊙ Not found ${label}`)
+  }
+}
+
+/**
+ * Remove directory if it exists
+ */
+function removeDirectory(dirPath, label) {
+  if (fileExists(dirPath)) {
+    fs.rmSync(dirPath, { recursive: true, force: true })
+    console.log(`  ✓ Removed ${label}`)
+  } else {
+    console.log(`  ⊙ Not found ${label}`)
+  }
+}
+
 /**
  * Parse JSON or JSONC file
  */
@@ -144,14 +170,14 @@ function installCommand(force) {
  */
 function installSkill(force) {
   if (fileExists(TARGET_SKILL) && !force) {
-    if (!promptConfirm(`Skill file exists: ${TARGET_SKILL}\nOverwrite?`)) {
+    if (!promptConfirm(`Skill directory exists: ${path.dirname(TARGET_SKILL)}\nOverwrite?`)) {
       console.log(`  ⊘ Skipped ${TARGET_SKILL}`)
       return
     }
   }
 
   copyFile(SKILL_FILE, TARGET_SKILL)
-  console.log(`  ✓ Created ${TARGET_SKILL}`)
+  console.log(`  ✓ Created ${path.join(path.basename(path.dirname(TARGET_SKILL)), path.basename(TARGET_SKILL))}`)
 }
 
 /**
@@ -162,36 +188,125 @@ function mergeConfig() {
   let existingConfig = {}
   if (fileExists(TARGET_CONFIG)) {
     existingConfig = parseConfig(TARGET_CONFIG)
+    // REMOVE old 'options' field to prevent verbose agent output
+    if (existingConfig.agent?.['glm-quota-exec']?.options) {
+      delete existingConfig.agent['glm-quota-exec'].options
+    }
   }
 
   // Parse new agent config from integration
   const newConfig = parseConfig(AGENT_CONFIG)
 
-  // Merge agent definitions first
-  const mergedConfig = deepMerge(existingConfig, newConfig)
+  const PLUGIN_NAME = 'opencode-glm-quota'
 
-  // Ensure plugins array exists and add our plugin
-  if (!mergedConfig.plugins) {
-    mergedConfig.plugins = []
+  // Handle both "plugin" array and "agent" section
+  // Check for "plugin" array first (user's config uses this)
+  const pluginArrayName = existingConfig.plugin ? 'plugin' : 'plugins'
+
+  // Only ensure that array we're going to use exists, not both!
+  if (!existingConfig[pluginArrayName]) {
+    existingConfig[pluginArrayName] = []
   }
 
-  const PLUGIN_NAME = '@opencode-glm-quota/plugin'
-  const plugins = Array.isArray(mergedConfig.plugins) ? mergedConfig.plugins : []
+  const plugins = Array.isArray(existingConfig[pluginArrayName]) ? existingConfig[pluginArrayName] : []
+
+  // REPLACE entire glm-quota-exec agent (not merge, to remove old redundant fields)
+  if (newConfig.agent && newConfig.agent['glm-quota-exec']) {
+    if (!existingConfig.agent) {
+      existingConfig.agent = {}
+    }
+    existingConfig.agent['glm-quota-exec'] = newConfig.agent['glm-quota-exec']
+  } else if (!existingConfig.agent && newConfig.agent) {
+    existingConfig.agent = newConfig.agent
+  }
 
   // Only add if not already present
   if (!plugins.includes(PLUGIN_NAME)) {
     plugins.push(PLUGIN_NAME)
-    mergedConfig.plugins = plugins
-    console.log(`  ✓ Added ${PLUGIN_NAME} to plugins array`)
+    existingConfig[pluginArrayName] = plugins
+    console.log(`  ✓ Added ${PLUGIN_NAME} to ${pluginArrayName} array`)
   } else {
-    console.log(`  ⊙ Plugin ${PLUGIN_NAME} already in plugins array`)
+    console.log(`  ⊙ Plugin ${PLUGIN_NAME} already in ${pluginArrayName} array`)
   }
 
-  // Write merged config back to the same file (opencode.json or opencode.jsonc)
-  writeConfig(TARGET_CONFIG, mergedConfig)
+  // Write merged config back to same file (opencode.json or opencode.jsonc)
+  writeConfig(TARGET_CONFIG, existingConfig)
   console.log(`  ✓ Merged configuration into ${path.basename(TARGET_CONFIG)}`)
 }
 
+/**
+ * Remove plugin configuration and agent configuration
+ */
+function removeConfig() {
+  if (!fileExists(TARGET_CONFIG)) {
+    console.log(`  ⊙ Config not found: ${TARGET_CONFIG}`)
+    return
+  }
+
+  const PLUGIN_NAME = 'opencode-glm-quota'
+  const existingConfig = parseConfig(TARGET_CONFIG)
+  let changed = false
+
+  if (Array.isArray(existingConfig.plugin)) {
+    const next = existingConfig.plugin.filter((name) => name !== PLUGIN_NAME)
+    if (next.length !== existingConfig.plugin.length) {
+      existingConfig.plugin = next
+      changed = true
+      console.log('  ✓ Removed plugin from plugin array')
+    }
+  }
+
+  if (Array.isArray(existingConfig.plugins)) {
+    const next = existingConfig.plugins.filter((name) => name !== PLUGIN_NAME)
+    if (next.length !== existingConfig.plugins.length) {
+      existingConfig.plugins = next
+      changed = true
+      console.log('  ✓ Removed plugin from plugins array')
+    }
+  }
+
+  if (existingConfig.agent && existingConfig.agent['glm-quota-exec']) {
+    delete existingConfig.agent['glm-quota-exec']
+    if (Object.keys(existingConfig.agent).length === 0) {
+      delete existingConfig.agent
+    }
+    changed = true
+    console.log('  ✓ Removed glm-quota-exec agent config')
+  }
+
+  if (changed) {
+    writeConfig(TARGET_CONFIG, existingConfig)
+    console.log(`  ✓ Updated ${path.basename(TARGET_CONFIG)}`)
+  } else {
+    console.log('  ⊙ No config changes needed')
+  }
+}
+
+/**
+ * Remove npm package
+ */
+function removePackage(globalFlag) {
+  const args = ['remove', 'opencode-glm-quota']
+  if (globalFlag) {
+    args.push('--global')
+  }
+
+  const result = spawnSync('npm', args, { stdio: 'inherit' })
+  if (result.status !== 0) {
+    console.log('  ⊙ npm remove failed, remove manually if needed')
+  }
+}
+
+/**
+ * Uninstall integration files and configuration
+ */
+function uninstall(globalFlag) {
+  removeFile(TARGET_COMMAND, TARGET_COMMAND)
+  removeDirectory(path.dirname(TARGET_SKILL), path.dirname(TARGET_SKILL))
+  removeConfig()
+  removePackage(globalFlag)
+}
+
 // ==========================================
 // MAIN INSTALLATION FUNCTION
 // ==========================================
@@ -203,7 +318,17 @@ function main() {
   try {
     // Parse command line arguments
     const args = process.argv.slice(2)
+    const isUninstall = args.includes('uninstall')
     const forceFlag = args.includes('--force')
+    const globalFlag = args.includes('--global') || args.includes('-g')
+
+    if (isUninstall) {
+      console.log('✓ Uninstalling GLM Quota Plugin...\n')
+      uninstall(globalFlag)
+      console.log()
+      console.log('✓ Uninstall complete!')
+      return
+    }
 
     console.log('✓ Installing GLM Quota Plugin...\n')
 
@@ -224,6 +349,4 @@ function main() {
 }
 
 // Run installer
-if (import.meta.url === `file://${process.argv[1]}`) {
-  main()
-}
+main()

package/dist/utils/progress-bar.js

@@ -34,8 +34,8 @@ export function formatPercentage(percentage, decimals = 1) {
  * @returns Formatted progress bar line
  */
 export function formatProgressLine(label, percentage) {
-    const bar = createProgressBar(percentage);
+    const bar = createProgressBar(percentage, { width: 26 });
     const pctStr = formatPercentage(percentage).padStart(6);
-    const labelStr = label.padEnd(20);
+    const labelStr = label.slice(0, 20).padEnd(20);
     return `${labelStr} [${bar}] ${pctStr}`;
 }

package/integration/opencode.jsonc

@@ -4,14 +4,7 @@
     "glm-quota-exec": {
       "mode": "subagent",
       "system": "You are a minimal tool executor. Your only purpose is to execute the glm_quota tool when requested. Do not explain, reason, or add any commentary. Simply call the tool and return its output directly.",
-      "provider": "opencode",
-      "options": {
-        "system": "You are a minimal tool executor. Your only purpose is to execute the glm_quota tool when requested. Do not explain, reason, or add any commentary. Simply call the tool and return its output directly.",
-        "provider": "opencode"
-      },
       "permission": {}
     }
   }
-  // Note: This agent definition is merged into user's existing OpenCode config
-  // by the installer script to avoid overwriting their custom configurations
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "opencode-glm-quota",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "type": "module",
   "description": "OpenCode plugin to query Z.ai GLM Coding Plan usage statistics including quota limits, model usage, and MCP tool usage",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
-    "opencode-glm-quota-install": "./bin/install.js"
+    "opencode-glm-quota": "./bin/install.js"
   },
   "files": [
     "dist",
@@ -61,7 +61,7 @@
     "@types/node": "^20.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
-    "baseline-browser-mapping": "^2.9.17",
+    "baseline-browser-mapping": "^2.9.18",
     "c8": "^10.1.3",
     "eslint": "^8.0.0",
     "tsx": "^4.0.0",