From 791bd03724c978bce3c72a92891993926ff17329 Mon Sep 17 00:00:00 2001 From: cexll Date: Sun, 22 Feb 2026 16:45:26 +0800 Subject: [PATCH] fix installer offline fallback and remove codex/gemini skills --- bin/cli.js | 25 +-- skills/codex/SKILL.md | 334 -------------------------------- skills/gemini/SKILL.md | 120 ------------ skills/gemini/scripts/gemini.py | 140 ------------- 4 files changed, 14 insertions(+), 605 deletions(-) delete mode 100644 skills/codex/SKILL.md delete mode 100644 skills/gemini/SKILL.md delete mode 100755 skills/gemini/scripts/gemini.py diff --git a/bin/cli.js b/bin/cli.js index 11947bd..98e390a 100755 --- a/bin/cli.js +++ b/bin/cli.js @@ -1006,17 +1006,20 @@ async function installSelected(picks, tag, config, installDir, force, dryRun) { try { let repoRoot = repoRootFromHere(); if (needRepo || needWrapper) { - if (!tag) throw new Error("No tag available to download"); - const archive = path.join(tmp, "src.tgz"); - const url = `https://codeload.github.com/${REPO.owner}/${REPO.name}/tar.gz/refs/tags/${encodeURIComponent( - tag - )}`; - process.stdout.write(`Downloading ${REPO.owner}/${REPO.name}@${tag}...\n`); - await downloadToFile(url, archive); - process.stdout.write("Extracting...\n"); - const extracted = path.join(tmp, "src"); - await extractTarGz(archive, extracted); - repoRoot = extracted; + if (tag) { + const archive = path.join(tmp, "src.tgz"); + const url = `https://codeload.github.com/${REPO.owner}/${REPO.name}/tar.gz/refs/tags/${encodeURIComponent( + tag + )}`; + process.stdout.write(`Downloading ${REPO.owner}/${REPO.name}@${tag}...\n`); + await downloadToFile(url, archive); + process.stdout.write("Extracting...\n"); + const extracted = path.join(tmp, "src"); + await extractTarGz(archive, extracted); + repoRoot = extracted; + } else { + process.stdout.write("Offline mode: installing from local package contents.\n"); + } } await fs.promises.mkdir(installDir, { recursive: true }); diff --git a/skills/codex/SKILL.md b/skills/codex/SKILL.md deleted file mode 100644 index 21da4c7..0000000 --- a/skills/codex/SKILL.md +++ /dev/null @@ -1,334 +0,0 @@ ---- -name: codex -description: Execute Codex CLI for code analysis, refactoring, and automated code changes. Use when you need to delegate complex code tasks to Codex AI with file references (@syntax) and structured output. ---- - -# Codex CLI Integration - -## Overview - -Execute Codex CLI commands and parse structured JSON responses. Supports file references via `@` syntax, multiple models, and sandbox controls. - -## When to Use - -- Complex code analysis requiring deep understanding -- Large-scale refactoring across multiple files -- Automated code generation with safety controls - -## Fallback Policy - -Codex is the **primary execution method** for all code edits and tests. Direct execution is only permitted when: - -1. Codex is unavailable (service down, network issues) -2. Codex fails **twice consecutively** on the same task - -When falling back to direct execution: -- Log `CODEX_FALLBACK` with the reason -- Retry Codex on the next task (don't permanently switch) -- Document the fallback in the final summary - -## Usage - -**Mandatory**: Run every automated invocation through the Bash tool in the foreground with **HEREDOC syntax** to avoid shell quoting issues, keeping the `timeout` parameter fixed at `7200000` milliseconds (do not change it or use any other entry point). - -```bash -codex-wrapper - [working_dir] <<'EOF' - -EOF -``` - -**Why HEREDOC?** Tasks often contain code blocks, nested quotes, shell metacharacters (`$`, `` ` ``, `\`), and multiline text. HEREDOC (Here Document) syntax passes these safely without shell interpretation, eliminating quote-escaping nightmares. - -**Foreground only (no background/BashOutput)**: Never set `background: true`, never accept Claude's "Running in the background" mode, and avoid `BashOutput` streaming loops. Keep a single foreground Bash call per Codex task; if work might be long, split it into smaller foreground runs instead of offloading to background execution. - -**Simple tasks** (backward compatibility): -For simple single-line tasks without special characters, you can still use direct quoting: -```bash -codex-wrapper "simple task here" [working_dir] -``` - -**Resume a session with HEREDOC:** -```bash -codex-wrapper resume - [working_dir] <<'EOF' - -EOF -``` - -**Cross-platform notes:** -- **Bash/Zsh**: Use `<<'EOF'` (single quotes prevent variable expansion) -- **PowerShell 5.1+**: Use `@'` and `'@` (here-string syntax) - ```powershell - codex-wrapper - @' - task content - '@ - ``` - -## Environment Variables - -- **CODEX_TIMEOUT**: Override timeout in milliseconds (default: 7200000 = 2 hours) - - Example: `export CODEX_TIMEOUT=3600000` for 1 hour - -## Timeout Control - -- **Built-in**: Binary enforces 2-hour timeout by default -- **Override**: Set `CODEX_TIMEOUT` environment variable (in milliseconds, e.g., `CODEX_TIMEOUT=3600000` for 1 hour) -- **Behavior**: On timeout, sends SIGTERM, then SIGKILL after 5s if process doesn't exit -- **Exit code**: Returns 124 on timeout (consistent with GNU timeout) -- **Bash tool**: Always set `timeout: 7200000` parameter for double protection - -### Parameters - -- `task` (required): Task description, supports `@file` references -- `working_dir` (optional): Working directory (default: current) - -### Return Format - -Extracts `agent_message` from Codex JSON stream and appends session ID: -``` -Agent response text here... - ---- -SESSION_ID: 019a7247-ac9d-71f3-89e2-a823dbd8fd14 -``` - -Error format (stderr): -``` -ERROR: Error message -``` - -Return only the final agent message and session ID—do not paste raw `BashOutput` logs or background-task chatter into the conversation. - -### Invocation Pattern - -All automated executions must use HEREDOC syntax through the Bash tool in the foreground, with `timeout` fixed at `7200000` (non-negotiable): - -``` -Bash tool parameters: -- command: codex-wrapper - [working_dir] <<'EOF' - - EOF -- timeout: 7200000 -- description: -``` - -Run every call in the foreground—never append `&` to background it—so logs and errors stay visible for timely interruption or diagnosis. - -**Important:** Use HEREDOC (`<<'EOF'`) for all but the simplest tasks. This prevents shell interpretation of quotes, variables, and special characters. - -### Examples - -**Basic code analysis:** -```bash -# Recommended: with HEREDOC (handles any special characters) -codex-wrapper - <<'EOF' -explain @src/main.ts -EOF -# timeout: 7200000 - -# Alternative: simple direct quoting (if task is simple) -codex-wrapper "explain @src/main.ts" -``` - -**Refactoring with multiline instructions:** -```bash -codex-wrapper - <<'EOF' -refactor @src/utils for performance: -- Extract duplicate code into helpers -- Use memoization for expensive calculations -- Add inline comments for non-obvious logic -EOF -# timeout: 7200000 -``` - -**Multi-file analysis:** -```bash -codex-wrapper - "/path/to/project" <<'EOF' -analyze @. and find security issues: -1. Check for SQL injection vulnerabilities -2. Identify XSS risks in templates -3. Review authentication/authorization logic -4. Flag hardcoded credentials or secrets -EOF -# timeout: 7200000 -``` - -**Resume previous session:** -```bash -# First session -codex-wrapper - <<'EOF' -add comments to @utils.js explaining the caching logic -EOF -# Output includes: SESSION_ID: 019a7247-ac9d-71f3-89e2-a823dbd8fd14 - -# Continue the conversation with more context -codex-wrapper resume 019a7247-ac9d-71f3-89e2-a823dbd8fd14 - <<'EOF' -now add TypeScript type hints and handle edge cases where cache is null -EOF -# timeout: 7200000 -``` - -**Task with code snippets and special characters:** -```bash -codex-wrapper - <<'EOF' -Fix the bug in @app.js where the regex /\d+/ doesn't match "123" -The current code is: - const re = /\d+/; - if (re.test(input)) { ... } -Add proper escaping and handle $variables correctly. -EOF -``` - -### Parallel Execution - -> Important: -> - `--parallel` only reads task definitions from stdin. -> - It does not accept extra command-line arguments (no inline `workdir`, `task`, or other params). -> - Put all task metadata and content in stdin; nothing belongs after `--parallel` on the command line. - -**Correct vs Incorrect Usage** - -**Correct:** -```bash -# Option 1: file redirection -codex-wrapper --parallel < tasks.txt - -# Option 2: heredoc (recommended for multiple tasks) -codex-wrapper --parallel <<'EOF' ----TASK--- -id: task1 -workdir: /path/to/dir ----CONTENT--- -task content -EOF - -# Option 3: pipe -echo "---TASK---..." | codex-wrapper --parallel -``` - -**Incorrect (will trigger shell parsing errors):** -```bash -# Bad: no extra args allowed after --parallel -codex-wrapper --parallel - /path/to/dir <<'EOF' -... -EOF - -# Bad: --parallel does not take a task argument -codex-wrapper --parallel "task description" - -# Bad: workdir must live inside the task config -codex-wrapper --parallel /path/to/dir < tasks.txt -``` - -For multiple independent or dependent tasks, use `--parallel` mode with delimiter format: - -**Typical Workflow (analyze → implement → test, chained in a single parallel call)**: -```bash -codex-wrapper --parallel <<'EOF' ----TASK--- -id: analyze_1732876800 -workdir: /home/user/project ----CONTENT--- -analyze @spec.md and summarize API and UI requirements ----TASK--- -id: implement_1732876801 -workdir: /home/user/project -dependencies: analyze_1732876800 ----CONTENT--- -implement features from analyze_1732876800 summary in backend @services and frontend @ui ----TASK--- -id: test_1732876802 -workdir: /home/user/project -dependencies: implement_1732876801 ----CONTENT--- -add and run regression tests covering the new endpoints and UI flows -EOF -``` -A single `codex-wrapper --parallel` call schedules all three stages concurrently, using `dependencies` to enforce sequential ordering without multiple invocations. - -```bash -codex-wrapper --parallel <<'EOF' ----TASK--- -id: backend_1732876800 -workdir: /home/user/project/backend ----CONTENT--- -implement /api/orders endpoints with validation and pagination ----TASK--- -id: frontend_1732876801 -workdir: /home/user/project/frontend ----CONTENT--- -build Orders page consuming /api/orders with loading/error states ----TASK--- -id: tests_1732876802 -workdir: /home/user/project/tests -dependencies: backend_1732876800, frontend_1732876801 ----CONTENT--- -run API contract tests and UI smoke tests (waits for backend+frontend) -EOF -``` - -**Delimiter Format**: -- `---TASK---`: Starts a new task block -- `id: `: Required, unique task identifier - - Best practice: use `_` format (e.g., `auth_1732876800`, `api_test_1732876801`) - - Ensures uniqueness across runs and makes tasks traceable -- `workdir: `: Optional, working directory (default: `.`) - - Best practice: use absolute paths (e.g., `/home/user/project/backend`) - - Avoids ambiguity and ensures consistent behavior across environments - - Must be specified inside each task block; do not pass `workdir` as a CLI argument to `--parallel` - - Each task can set its own `workdir` when different directories are needed -- `dependencies: , `: Optional, comma-separated task IDs -- `session_id: `: Optional, resume a previous session -- `---CONTENT---`: Separates metadata from task content -- Task content: Any text, code, special characters (no escaping needed) - -**Dependencies Best Practices** - -- Avoid multiple invocations: Place "analyze then implement" in a single `codex-wrapper --parallel` call, chaining them via `dependencies`, rather than running analysis first and then launching implementation separately. -- Naming convention: Use `_` format (e.g., `analyze_1732876800`, `implement_1732876801`), where action names map to features/stages and timestamps ensure uniqueness and sortability. -- Dependency chain design: Keep chains short; only add dependencies for tasks that truly require ordering, let others run in parallel, avoiding over-serialization that reduces throughput. - -**Resume Failed Tasks**: -```bash -# Use session_id from previous output to resume -codex-wrapper --parallel <<'EOF' ----TASK--- -id: T2 -session_id: 019xxx-previous-session-id ----CONTENT--- -fix the previous error and retry -EOF -``` - -**Output**: Human-readable text format -``` -=== Parallel Execution Summary === -Total: 3 | Success: 2 | Failed: 1 - ---- Task: T1 --- -Status: SUCCESS -Session: 019xxx - -Task output message... - ---- Task: T2 --- -Status: FAILED (exit code 1) -Error: some error message -``` - -**Features**: -- Automatic topological sorting based on dependencies -- Unlimited concurrency for independent tasks -- Error isolation (failed tasks don't stop others) -- Dependency blocking (dependent tasks skip if parent fails) - -## Notes - -- **Binary distribution**: Single Go binary, zero dependencies -- **Installation**: Download from GitHub Releases or use install.sh -- **Cross-platform compatible**: Linux (amd64/arm64), macOS (amd64/arm64) -- All automated runs must use the Bash tool with the fixed timeout to provide dual timeout protection and unified logging/exit semantics -for automation (new sessions only) -- Uses `--skip-git-repo-check` to work in any directory -- Streams progress, returns only final agent message -- Every execution returns a session ID for resuming conversations -- Requires Codex CLI installed and authenticated diff --git a/skills/gemini/SKILL.md b/skills/gemini/SKILL.md deleted file mode 100644 index 87afb45..0000000 --- a/skills/gemini/SKILL.md +++ /dev/null @@ -1,120 +0,0 @@ ---- -name: gemini -description: Execute Gemini CLI for AI-powered code analysis and generation. Use when you need to leverage Google's Gemini models for complex reasoning tasks. ---- - -# Gemini CLI Integration - -## Overview - -Execute Gemini CLI commands with support for multiple models and flexible prompt input. Integrates Google's Gemini AI models into Claude Code workflows. - -## When to Use - -- Complex reasoning tasks requiring advanced AI capabilities -- Code generation and analysis with Gemini models -- Tasks requiring Google's latest AI technology -- Alternative perspective on code problems - -## Usage -**Mandatory**: Run via uv with fixed timeout 7200000ms (foreground): -```bash -uv run ~/.claude/skills/gemini/scripts/gemini.py "" [working_dir] -``` - -**Optional** (direct execution or using Python): -```bash -~/.claude/skills/gemini/scripts/gemini.py "" [working_dir] -# or -python3 ~/.claude/skills/gemini/scripts/gemini.py "" [working_dir] -``` - -## Environment Variables - -- **GEMINI_MODEL**: Configure model (default: `gemini-3-pro-preview`) - - Example: `export GEMINI_MODEL=gemini-3` - -## Timeout Control - -- **Fixed**: 7200000 milliseconds (2 hours), immutable -- **Bash tool**: Always set `timeout: 7200000` for double protection - -### Parameters - -- `prompt` (required): Task prompt or question -- `working_dir` (optional): Working directory (default: current directory) - -### Return Format - -Plain text output from Gemini: - -```text -Model response text here... -``` - -Error format (stderr): - -```text -ERROR: Error message -``` - -### Invocation Pattern - -When calling via Bash tool, always include the timeout parameter: - -```yaml -Bash tool parameters: -- command: uv run ~/.claude/skills/gemini/scripts/gemini.py "" -- timeout: 7200000 -- description: -``` - -Alternatives: - -```yaml -# Direct execution (simplest) -- command: ~/.claude/skills/gemini/scripts/gemini.py "" - -# Using python3 -- command: python3 ~/.claude/skills/gemini/scripts/gemini.py "" -``` - -### Examples - -**Basic query:** - -```bash -uv run ~/.claude/skills/gemini/scripts/gemini.py "explain quantum computing" -# timeout: 7200000 -``` - -**Code analysis:** - -```bash -uv run ~/.claude/skills/gemini/scripts/gemini.py "review this code for security issues: $(cat app.py)" -# timeout: 7200000 -``` - -**With specific working directory:** - -```bash -uv run ~/.claude/skills/gemini/scripts/gemini.py "analyze project structure" "/path/to/project" -# timeout: 7200000 -``` - -**Using python3 directly (alternative):** - -```bash -python3 ~/.claude/skills/gemini/scripts/gemini.py "your prompt here" -``` - -## Notes - -- **Recommended**: Use `uv run` for automatic Python environment management (requires uv installed) -- **Alternative**: Direct execution `./gemini.py` (uses system Python via shebang) -- Python implementation using standard library (zero dependencies) -- Cross-platform compatible (Windows/macOS/Linux) -- PEP 723 compliant (inline script metadata) -- Requires Gemini CLI installed and authenticated -- Supports all Gemini model variants (configure via `GEMINI_MODEL` environment variable) -- Output is streamed directly from Gemini CLI diff --git a/skills/gemini/scripts/gemini.py b/skills/gemini/scripts/gemini.py deleted file mode 100755 index fd0f63d..0000000 --- a/skills/gemini/scripts/gemini.py +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/env python3 -# /// script -# requires-python = ">=3.8" -# dependencies = [] -# /// -""" -Gemini CLI wrapper with cross-platform support. - -Usage: - uv run gemini.py "" [workdir] - python3 gemini.py "" - ./gemini.py "your prompt" -""" -import subprocess -import sys -import os - -DEFAULT_MODEL = os.environ.get('GEMINI_MODEL', 'gemini-3-pro-preview') -DEFAULT_WORKDIR = '.' -TIMEOUT_MS = 7_200_000 # 固定 2 小时，毫秒 -DEFAULT_TIMEOUT = TIMEOUT_MS // 1000 -FORCE_KILL_DELAY = 5 - - -def log_error(message: str): - """输出错误信息到 stderr""" - sys.stderr.write(f"ERROR: {message}\n") - - -def log_warn(message: str): - """输出警告信息到 stderr""" - sys.stderr.write(f"WARN: {message}\n") - - -def log_info(message: str): - """输出信息到 stderr""" - sys.stderr.write(f"INFO: {message}\n") - - -def parse_args(): - """解析位置参数""" - if len(sys.argv) < 2: - log_error('Prompt required') - sys.exit(1) - - return { - 'prompt': sys.argv[1], - 'workdir': sys.argv[2] if len(sys.argv) > 2 else DEFAULT_WORKDIR - } - - -def build_gemini_args(args) -> list: - """构建 gemini CLI 参数""" - return [ - 'gemini', - '-m', DEFAULT_MODEL, - '-p', args['prompt'] - ] - - -def main(): - log_info('Script started') - args = parse_args() - log_info(f"Prompt length: {len(args['prompt'])}") - log_info(f"Working dir: {args['workdir']}") - gemini_args = build_gemini_args(args) - timeout_sec = DEFAULT_TIMEOUT - log_info(f"Timeout: {timeout_sec}s") - - # 如果指定了工作目录，切换到该目录 - if args['workdir'] != DEFAULT_WORKDIR: - try: - os.chdir(args['workdir']) - except FileNotFoundError: - log_error(f"Working directory not found: {args['workdir']}") - sys.exit(1) - except PermissionError: - log_error(f"Permission denied: {args['workdir']}") - sys.exit(1) - log_info('Changed working directory') - - try: - log_info(f"Starting gemini with model {DEFAULT_MODEL}") - process = None - # 启动 gemini 子进程，直接透传 stdout 和 stderr - process = subprocess.Popen( - gemini_args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - text=True, - bufsize=1 # 行缓冲 - ) - - # 实时输出 stdout - for line in process.stdout: - sys.stdout.write(line) - sys.stdout.flush() - - # 等待进程结束 - returncode = process.wait(timeout=timeout_sec) - - # 读取 stderr - stderr_output = process.stderr.read() - if stderr_output: - sys.stderr.write(stderr_output) - - # 检查退出码 - if returncode != 0: - log_error(f'Gemini exited with status {returncode}') - sys.exit(returncode) - - sys.exit(0) - - except subprocess.TimeoutExpired: - log_error(f'Gemini execution timeout ({timeout_sec}s)') - if process is not None: - process.kill() - try: - process.wait(timeout=FORCE_KILL_DELAY) - except subprocess.TimeoutExpired: - pass - sys.exit(124) - - except FileNotFoundError: - log_error("gemini command not found in PATH") - log_error("Please install Gemini CLI: https://github.com/google/generative-ai-python") - sys.exit(127) - - except KeyboardInterrupt: - if process is not None: - process.terminate() - try: - process.wait(timeout=FORCE_KILL_DELAY) - except subprocess.TimeoutExpired: - process.kill() - sys.exit(130) - - -if __name__ == '__main__': - main()