coderfleet 0.1.0__py3-none-any.whl

coderfleet/config_cmds.py

@@ -0,0 +1,243 @@
+"""
+config_cmds.py — coderfleet account / project 子命令
+"""
+from __future__ import annotations
+
+import re
+import subprocess
+from pathlib import Path
+from typing import Optional
+
+import click
+
+from coderfleet.config import ensure_workspace, parse_conf, remove_conf_entry, write_conf_line
+
+_NAME_RE = re.compile(r"^[a-zA-Z0-9-]+$")
+
+
+def _container_name(project_name: str, acc_type: str) -> str:
+    return f"{acc_type}-{project_name}"
+
+
+def _is_running(container: str) -> bool:
+    r = subprocess.run(
+        ["docker", "inspect", container, "--format", "{{.State.Running}}"],
+        capture_output=True, text=True,
+    )
+    return r.stdout.strip() == "true"
+
+
+# ── account ───────────────────────────────────────────────────
+
+
+@click.group("account")
+def account_group() -> None:
+    """Account management commands."""
+    pass
+
+
+@account_group.command("add")
+@click.argument("name")
+@click.argument("typearg", metavar="TYPE=codex|claude")
+@click.option("--auth", default="login", type=click.Choice(["login", "env"]),
+              show_default=True, help="Authentication method")
+@click.option("--env-file", "env_file", default=None,
+              help="Env file path (for --auth env, default: accounts/<name>/env)")
+@click.option("--proxy", default="relay", type=click.Choice(["relay", "off"]),
+              show_default=True, help="Proxy mode")
+@click.pass_context
+def cmd_account_add(
+    ctx: click.Context,
+    name: str,
+    typearg: str,
+    auth: str,
+    env_file: Optional[str],
+    proxy: str,
+) -> None:
+    """Add a new account. TYPE=codex|claude (or just codex|claude)."""
+    ws: Path = ctx.obj["workspace"]
+
+    if not _NAME_RE.match(name):
+        raise click.ClickException("NAME 只能包含字母、数字、连字符")
+
+    acc_type = typearg[5:] if typearg.startswith("TYPE=") else typearg
+    if acc_type not in ("codex", "claude"):
+        raise click.ClickException("TYPE 不合法，只支持 TYPE=codex 或 TYPE=claude")
+
+    if auth == "env":
+        if acc_type != "claude":
+            raise click.ClickException("AUTH=env 目前只支持 TYPE=claude")
+        if not env_file:
+            env_file = f"./accounts/{name}/env"
+
+    accounts_conf = ws / "accounts.conf"
+    for r in parse_conf(accounts_conf):
+        if r.get("NAME") == name:
+            raise click.ClickException(f"账号 '{name}' 已存在，若要修改请先 remove 再 add")
+
+    tokens: dict[str, str] = {"NAME": name, "TYPE": acc_type, "AUTH": auth}
+    if auth == "env" and env_file:
+        tokens["ENV_FILE"] = env_file
+    tokens["PROXY"] = proxy
+
+    ensure_workspace(ws)
+    write_conf_line(accounts_conf, tokens)
+    (ws / "accounts" / name).mkdir(parents=True, exist_ok=True)
+
+    click.secho(f"✓ 账号 '{name}' 已添加（类型：{acc_type}，认证：{auth}，代理：{proxy}）", fg="green")
+    if auth == "env":
+        click.secho(f"  请在 {env_file} 中配置 ANTHROPIC_API_KEY 等环境变量", fg="yellow")
+    click.secho(f"  接下来：coderfleet project add <项目名> {name} <项目路径>", dim=True)
+    click.secho("  执行 coderfleet apply 使配置生效", fg="yellow")
+
+
+@account_group.command("remove")
+@click.argument("name")
+@click.pass_context
+def cmd_account_remove(ctx: click.Context, name: str) -> None:
+    """Remove an account (stops associated containers)."""
+    ws: Path = ctx.obj["workspace"]
+    accounts_conf = ws / "accounts.conf"
+    projects_conf = ws / "projects.conf"
+
+    accounts = {r["NAME"]: r for r in parse_conf(accounts_conf) if "NAME" in r}
+    if name not in accounts:
+        raise click.ClickException(f"账号 '{name}' 不存在")
+
+    acc_type = accounts[name].get("TYPE", "")
+    if acc_type:
+        for p in parse_conf(projects_conf):
+            if p.get("ACCOUNT") != name:
+                continue
+            pname = p.get("NAME", "")
+            ctr = _container_name(pname, acc_type)
+            if _is_running(ctr):
+                click.echo(f"  停止容器 {ctr}...")
+                subprocess.run(["docker", "stop", ctr], capture_output=True)
+                subprocess.run(["docker", "rm", ctr], capture_output=True)
+
+    remove_conf_entry(accounts_conf, "NAME", name)
+    click.secho(f"✓ 账号 '{name}' 已从配置中移除", fg="green")
+    click.secho(f"  认证数据保留在 accounts/{name}/  如需清除：rm -rf accounts/{name}", fg="yellow")
+    click.secho("  执行 coderfleet apply 重新生成配置", fg="yellow")
+
+
+@account_group.command("list")
+@click.pass_context
+def cmd_account_list(ctx: click.Context) -> None:
+    """List all accounts."""
+    ws: Path = ctx.obj["workspace"]
+    accounts = parse_conf(ws / "accounts.conf")
+    projects = parse_conf(ws / "projects.conf")
+
+    click.echo()
+    click.echo("  ── 账号列表 " + "─" * 58)
+    click.echo(f"  {'名称':<20} {'类型':<8} {'认证':<8} {'代理':<8}  状态")
+    click.echo("  " + "─" * 70)
+
+    if not accounts:
+        click.secho("  暂无账号，使用 coderfleet account add 添加", fg="yellow")
+        click.echo()
+        return
+
+    for rec in accounts:
+        name = rec.get("NAME", "")
+        acc_type = rec.get("TYPE", "")
+        auth = rec.get("AUTH", "login")
+        proxy = rec.get("PROXY", "relay")
+
+        any_running = any(
+            _is_running(_container_name(p.get("NAME", ""), acc_type))
+            for p in projects
+            if p.get("ACCOUNT") == name
+        )
+        status = click.style("● 运行中", fg="green") if any_running else click.style("○ 已停止", fg="yellow")
+        click.echo(f"  {name:<20} {acc_type:<8} {auth:<8} {proxy:<8}  {status}")
+
+    click.echo()
+
+
+# ── project ───────────────────────────────────────────────────
+
+
+@click.group("project")
+def project_group() -> None:
+    """Project management commands."""
+    pass
+
+
+@project_group.command("add")
+@click.argument("name")
+@click.argument("account")
+@click.argument("path")
+@click.pass_context
+def cmd_project_add(
+    ctx: click.Context,
+    name: str,
+    account: str,
+    path: str,
+) -> None:
+    """Add a new project."""
+    ws: Path = ctx.obj["workspace"]
+
+    if not _NAME_RE.match(name):
+        raise click.ClickException("项目名称只能包含字母、数字、连字符")
+
+    accounts_conf = ws / "accounts.conf"
+    accounts = {r["NAME"] for r in parse_conf(accounts_conf) if "NAME" in r}
+    if account not in accounts:
+        raise click.ClickException(f"账号 '{account}' 不存在")
+
+    projects_conf = ws / "projects.conf"
+    for p in parse_conf(projects_conf):
+        if p.get("NAME") == name:
+            raise click.ClickException(f"项目 '{name}' 已存在，若要修改请先 remove 再 add")
+
+    ensure_workspace(ws)
+    write_conf_line(projects_conf, {"NAME": name, "ACCOUNT": account, "PATH": path})
+
+    expanded = str(Path(path).expanduser())
+    click.secho(f"✓ 项目 '{name}' 已添加（账号：{account}  路径：{expanded}）", fg="green")
+    click.secho("  执行 coderfleet apply 使配置生效", fg="yellow")
+
+
+@project_group.command("remove")
+@click.argument("name")
+@click.pass_context
+def cmd_project_remove(ctx: click.Context, name: str) -> None:
+    """Remove a project."""
+    ws: Path = ctx.obj["workspace"]
+    projects_conf = ws / "projects.conf"
+
+    if not any(p.get("NAME") == name for p in parse_conf(projects_conf)):
+        raise click.ClickException(f"项目 '{name}' 不存在")
+
+    remove_conf_entry(projects_conf, "NAME", name)
+    click.secho(f"✓ 项目 '{name}' 已移除", fg="green")
+    click.secho("  执行 coderfleet apply 重新生成配置", fg="yellow")
+
+
+@project_group.command("list")
+@click.pass_context
+def cmd_project_list(ctx: click.Context) -> None:
+    """List all projects."""
+    ws: Path = ctx.obj["workspace"]
+    projects = parse_conf(ws / "projects.conf")
+
+    click.echo()
+    click.echo("  ── 项目列表 " + "─" * 62)
+    click.echo(f"  {'名称':<20} {'账号':<20}  路径")
+    click.echo("  " + "─" * 74)
+
+    if not projects:
+        click.secho("  暂无项目，使用 coderfleet project add 添加", fg="yellow")
+        click.echo()
+        return
+
+    for p in projects:
+        name = p.get("NAME", "")
+        account = p.get("ACCOUNT", "")
+        path = p.get("PATH", "")
+        click.echo(f"  {name:<20} {account:<20}  {path}")
+
+    click.echo()

coderfleet/data/Dockerfile

@@ -0,0 +1,92 @@
+# ============================================================
+#  CoderFleet — 统一工作容器镜像
+#  包含：Python 3.12 / Node.js 20 / Codex CLI / Claude Code
+#  平台：linux/amd64（Apple Silicon 通过 Docker 模拟运行）
+# ============================================================
+
+FROM --platform=linux/amd64 ubuntu:24.04
+
+# 避免交互式安装询问
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Asia/Shanghai
+
+# ── 基础系统工具 ──────────────────────────────────────────
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    # 网络工具
+    curl wget ca-certificates netcat-openbsd \
+    # 开发基础
+    git build-essential pkg-config \
+    # Python 依赖
+    libssl-dev libffi-dev zlib1g-dev libbz2-dev \
+    libreadline-dev libsqlite3-dev liblzma-dev \
+    # 系统工具
+    bash-completion less vim nano \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# ── Node.js 20 (via NodeSource) ───────────────────────────
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y nodejs \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# 验证 Node 版本并安装常用全局包
+RUN node --version && npm --version \
+    && npm install -g npm@latest
+
+# ── Python 3.12 (via deadsnakes PPA) ─────────────────────
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    software-properties-common \
+    && add-apt-repository ppa:deadsnakes/ppa \
+    && apt-get update && apt-get install -y --no-install-recommends \
+    python3.12 python3.12-dev python3.12-venv python3-pip \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# 设置 python3.12 为默认 python3
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 \
+    && update-alternatives --install /usr/bin/python  python  /usr/bin/python3.12 1
+
+# 安装常用 Python 工具
+# Ubuntu 24.04 实行 PEP 668，系统 Python 需加 --break-system-packages
+RUN pip3 install --no-cache-dir --break-system-packages \
+    uv ruff black mypy pexpect
+
+# ── Codex CLI ─────────────────────────────────────────────
+RUN npm install -g @openai/codex
+
+# ── Claude Code CLI ───────────────────────────────────────
+RUN npm install -g @anthropic-ai/claude-code
+
+# ── Rust 1.93.0 ───────────────────────────────────────────
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH \
+    RUSTUP_DIST_SERVER=https://rsproxy.cn \
+    RUSTUP_UPDATE_ROOT=https://rsproxy.cn/rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://rsproxy.cn/rustup-init.sh | sh -s -- -y --no-modify-path --default-toolchain 1.93.0 \
+    && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
+    && rustc --version
+
+# ── 创建非特权用户 byclaw ─────────────────────────────────
+RUN groupadd -r byclaw && useradd -r -g byclaw -m -s /bin/bash byclaw
+
+# ── 工作目录和环境变量 ────────────────────────────────────
+RUN mkdir -p /workspace && chown byclaw:byclaw /workspace
+WORKDIR /workspace
+
+# 这两个目录由 CoderFleet 按账号挂载，容器内路径固定
+# Codex 认证：/home/byclaw/.codex   由 CODEX_HOME 控制
+# Claude 认证：/home/byclaw/.claude  由 CLAUDE_CONFIG_DIR 控制
+ENV CODEX_HOME=/home/byclaw/.codex
+ENV CLAUDE_CONFIG_DIR=/home/byclaw/.claude
+
+# ── 启动脚本 ──────────────────────────────────────────────
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+COPY scripts/coderfleet_usage_status.py /usr/local/bin/coderfleet-usage-status
+RUN chmod +x /usr/local/bin/coderfleet-usage-status
+
+# ── 切换为非特权用户 ──────────────────────────────────────
+USER byclaw
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["sleep", "infinity"]

coderfleet/data/accounts.conf.example

@@ -0,0 +1,26 @@
+# ============================================================
+#  accounts.conf — CoderFleet 账号配置
+#
+#  字段说明：
+#    NAME=<名称>             必填，只允许字母/数字/连字符
+#    TYPE=codex|claude       必填，使用哪个 AI CLI
+#    AUTH=login|env          可选，默认 login
+#    ENV_FILE=<路径>         AUTH=env 时可选；省略则默认 ./accounts/<名称>/env
+#    PROXY=relay|off         可选，默认 relay；off 表示该账号下项目不注入代理
+#
+#  项目路径请配置在 projects.conf。
+#  修改后执行 coderfleet apply 生效。
+# ============================================================
+
+# Codex 账号示例
+# NAME=codex-alice  TYPE=codex
+
+# Claude Code 账号示例
+# NAME=claude-alice  TYPE=claude
+
+# Claude Code 环境变量认证示例（API key 会优先于订阅登录态）
+# NAME=claude-api    TYPE=claude AUTH=env
+# NAME=claude-api    TYPE=claude AUTH=env ENV_FILE=./accounts/claude-api/env
+
+# 不走代理的账号示例（该账号关联的项目都会直连）
+# NAME=claude-local  TYPE=claude PROXY=off

coderfleet/data/config.conf.example

@@ -0,0 +1,31 @@
+# ============================================================
+#  config.conf — CoderFleet 全局配置
+#  修改后执行 coderfleet apply 生效
+# ============================================================
+
+# ── 镜像配置 ──────────────────────────────────────────────
+IMAGE_NAME=coderfleet
+IMAGE_TAG=latest
+
+# 构建平台（Mac M 系列芯片固定用 linux/amd64，由 Docker Rosetta 模拟运行）
+BUILD_PLATFORM=linux/arm64
+
+# ── 代理配置 ──────────────────────────────────────────────
+# 宿主机代理地址（容器通过 host.docker.internal 访问宿主机）
+PROXY_HOST=host.docker.internal
+
+# 宿主机代理端口
+# 混合端口（同时支持 HTTP/SOCKS5，如 v2ray/sing-box 的混合入站）：两个填同一个值
+# 分开端口（如 Clash：HTTP=7890 SOCKS5=7891）：分别填写
+PROXY_HTTP_PORT=10808
+PROXY_SOCKS5_PORT=10808
+
+# ── 内部网络配置 ──────────────────────────────────────────
+INTERNAL_SUBNET=172.21.0.0/16
+RELAY_IP=172.21.0.2
+
+# 代理中继对内网监听的端口（容器内 HTTP_PROXY 指向此端口）
+RELAY_LISTEN_PORT=10808
+
+# 代理中继镜像
+RELAY_IMAGE=gogost/gost:3

coderfleet/data/entrypoint.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+# ============================================================
+#  CoderFleet — 容器启动脚本
+#  负责：代理验证、认证目录初始化、启动保活进程
+# ============================================================
+
+set -e
+
+# ── 打印启动信息 ─────────────────────────────────────────
+echo "========================================"
+echo "  CoderFleet Container"
+echo "  账号：${CODERFLEET_ACCOUNT_NAME:-unknown}"
+echo "  类型：${CODERFLEET_ACCOUNT_TYPE:-unknown}"
+echo "  认证：${CODERFLEET_ACCOUNT_AUTH:-login}"
+echo "========================================"
+
+# ── 等待代理中继就绪 ──────────────────────────────────────
+if [ "${CODERFLEET_ACCOUNT_PROXY:-relay}" = "off" ]; then
+    echo "账号代理：关闭（不等待代理中继）"
+else
+    PROXY_HOST="${CODERFLEET_RELAY_IP:-172.20.0.2}"
+    PROXY_PORT="${CODERFLEET_RELAY_PORT:-7890}"
+    MAX_WAIT=30
+    waited=0
+
+    echo "等待代理中继 ${PROXY_HOST}:${PROXY_PORT}..."
+    while ! nc -z "$PROXY_HOST" "$PROXY_PORT" 2>/dev/null; do
+        if [ "$waited" -ge "$MAX_WAIT" ]; then
+            echo "警告：代理中继未就绪，继续启动（网络可能不可用）"
+            break
+        fi
+        sleep 1
+        waited=$((waited + 1))
+    done
+    [ "$waited" -lt "$MAX_WAIT" ] && echo "代理中继已就绪"
+fi
+
+# ── 初始化认证目录 ────────────────────────────────────────
+ACCOUNT_TYPE="${CODERFLEET_ACCOUNT_TYPE:-codex}"
+case "$ACCOUNT_TYPE" in
+    codex)
+        mkdir -p "$CODEX_HOME"
+        echo "Codex 认证目录：$CODEX_HOME"
+        ;;
+    claude)
+        mkdir -p "$CLAUDE_CONFIG_DIR"
+        echo "Claude 认证目录：$CLAUDE_CONFIG_DIR"
+        if [ "${CODERFLEET_ACCOUNT_AUTH:-login}" = "env" ]; then
+            echo "Claude 环境变量认证：已启用"
+        fi
+        ;;
+esac
+
+# ── 执行传入的命令（默认 sleep infinity）─────────────────
+echo "容器启动完成，执行：$*"
+exec "$@"

coderfleet/data/projects.conf.example

@@ -0,0 +1,17 @@
+# ============================================================
+#  projects.conf — CoderFleet 项目配置
+#
+#  字段说明：
+#    NAME=<名称>             必填，只允许字母/数字/连字符
+#    ACCOUNT=<账号名>        必填，使用 accounts.conf 中的账号
+#    PATH=<项目路径>         必填，挂载进该账号容器的目录（支持 ~）
+#
+#  修改后执行 coderfleet apply 生效。
+# ============================================================
+
+# 示例：
+# NAME=my-app  ACCOUNT=codex-alice  PATH=~/projects/my-app
+# NAME=local-app ACCOUNT=claude-local PATH=~/projects/local-app
+
+NAME=byclaw-code-agent    ACCOUNT=codex-zhchxiao123 PATH=/home/demo/demo-byclaw
+NAME=timelog              ACCOUNT=claude-fajikmomi   PATH=/home/demo/demo-timelog

coderfleet/data/scripts/coderfleet_usage_status.py

@@ -0,0 +1,138 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import re
+import shutil
+import subprocess
+import sys
+import time
+from typing import Any
+
+
+ANSI_RE = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
+STATUS_LINE_RE = re.compile(
+    r"(5h|five|weekly|week|limit|left|remaining|usage|quota|reset|used|剩余|用量|限制|重置)",
+    re.IGNORECASE,
+)
+
+
+def strip_ansi(text: str) -> str:
+    return ANSI_RE.sub("", text)
+
+
+def unique_lines(lines: list[str]) -> list[str]:
+    seen: set[str] = set()
+    result: list[str] = []
+    for line in lines:
+        if line not in seen:
+            seen.add(line)
+            result.append(line)
+    return result
+
+
+def clean_status_line(line: str) -> str:
+    cleaned = line.strip().strip("│").strip()
+    cleaned = re.sub(r"\[[█░▒▓#=\-\s]+\]\s*", "", cleaned)
+    cleaned = re.sub(r"\s{2,}", " ", cleaned)
+    cleaned = re.sub(r"^([A-Za-z0-9 ]+ limit:)\s+", r"\1 ", cleaned)
+    return cleaned
+
+
+def extract_codex_usage_summary(text: str) -> str:
+    cleaned_text = strip_ansi(text)
+    matched = [
+        clean_status_line(line)
+        for line in cleaned_text.splitlines()
+        if re.search(r"\b(5h|Weekly) limit:\s+", line, re.IGNORECASE)
+    ]
+    matched = [line for line in matched if line]
+    return "\n".join(unique_lines(matched))
+
+
+def check_codex_login() -> bool:
+    try:
+        result = subprocess.run(
+            ["codex", "login", "status"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            timeout=20,
+            check=False,
+        )
+        return result.returncode == 0
+    except (OSError, subprocess.SubprocessError):
+        return False
+
+
+def read_available(child: Any, pexpect_module: Any, size: int = 20000, timeout: int = 3) -> str:
+    try:
+        return child.read_nonblocking(size=size, timeout=timeout)
+    except pexpect_module.TIMEOUT:
+        return ""
+
+
+def collect_codex_status() -> str:
+    if shutil.which("codex") is None:
+        return "Codex CLI 不存在，跳过用量检查"
+    if not check_codex_login():
+        return "Codex 未登录或凭证不可用，跳过用量检查"
+
+    import pexpect
+
+    child = pexpect.spawn(
+        "codex",
+        encoding="utf-8",
+        timeout=25,
+        dimensions=(40, 160),
+    )
+    buf = ""
+
+    try:
+        time.sleep(2)
+        buf += read_available(child, pexpect, timeout=1)
+
+        child.sendline("/status")
+        time.sleep(4)
+        buf += read_available(child, pexpect)
+
+        child.sendline("/exit")
+        try:
+            child.expect(pexpect.EOF, timeout=8)
+            buf += child.before or ""
+        except pexpect.TIMEOUT:
+            child.sendcontrol("c")
+            child.close(force=True)
+    finally:
+        if child.isalive():
+            child.close(force=True)
+
+    summary = extract_codex_usage_summary(buf)
+    if summary:
+        return summary
+
+    text = strip_ansi(buf)
+    matched = [
+        clean_status_line(line)
+        for line in text.splitlines()
+        if line.strip() and STATUS_LINE_RE.search(line)
+    ]
+    matched = [line for line in matched if line]
+    return "\n".join(unique_lines(matched)) if matched else text.strip()
+
+
+def main(argv: list[str]) -> int:
+    cli = argv[1] if len(argv) > 1 else "codex"
+    if cli != "codex":
+        print(f"{cli} 暂未支持自动用量检查")
+        return 0
+
+    try:
+        output = collect_codex_status()
+    except Exception as err:
+        output = f"Codex 用量检查失败：{err}"
+    print(output or "未获取到 Codex 用量信息")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main(sys.argv))