@adgine/geo-cli 1.2.8

package/skills/adgine-geo-content/SKILL.md

@@ -0,0 +1,224 @@
+---
+name: adgine/geo-content
+description: Generates AI-optimized article outlines and full articles for GEO content strategy, manages the content library, and inspects/retries the underlying outline and article generation jobs. Supports generating title suggestions, producing a keyword-optimized outline (async), writing a complete article from an approved outline (async), listing/editing/deleting content items (with optional publish-status filter), and managing the workflow / outline / article job lists with detail inspection and retry. Use when the user wants to create an article (写文章 / generate article), generate an outline (生成大纲 / outline), write GEO-optimized content, check content status, review generated articles, filter by publish status (已发布/未发布, published/unpublished), manage their content pipeline, check job progress (任务进度 / job status), or retry a failed content job (重试失败任务 / retry job). Intent synonyms: article generation, outline generation, content jobs, content workflow, retry failed job, 内容生成任务, 已发布文章, 未发布文章.
+---
+
+# GEO Content
+
+## Output rules — IDs (apply to every reply)
+
+These rules apply to **every list, table, and confirmation message** in this skill. Their goal: keep user-facing output friendly while preserving the IDs the agent needs internally.
+
+1. **Lists & tables — never show raw UUIDs in cells.** Use a 1-based `#` index column instead. Keep a private mental mapping of `#N → actual UUID` so that follow-up commands like *"delete #3"*, *"run citation test on #1 #2"*, *"show details of the 2nd one"* resolve to the right entity.
+   - Index numbers restart from 1 in each new list — they are not stable across calls.
+   - If the user references *"the topic about X"* / *"that Poki vs CrazyGames prompt"*, match by visible content (name / title / domain / prompt text), not by ID.
+
+2. **Single-item operations — prefer a human name over an ID.**
+   - ✅ *"Project **Poki vs Competitors** deleted."*
+   - ✅ *"Topic **Brand mentions in 2024** updated — name → 'Brand mentions 2025'."*
+   - ❌ *"Project `a4305b57-1c79-4cec-a17c-16eb1d959ea6` deleted."*
+   - If the entity has **no human-readable name** (e.g. an anonymous prompt or a job), use a short 8-character prefix: *"Prompt `2a2a8f4f…` deleted."* Never paste the full UUID.
+
+3. **Always exception: `--json` mode.** When the user passes `--json` to a script or explicitly asks for raw JSON / debug output, print the script output verbatim — do not strip IDs.
+
+4. **Internally, the agent still uses full UUIDs** for every API call (`--project-id`, `--topic-id`, `--prompt-id`, etc.). The display rules only affect what is shown back to the user.
+
+---
+
+## Step 1: Make sure GEO_API_KEY is configured
+
+Scripts auto-load `GEO_API_KEY` from `<skills-root>/.env` on import — **no `export` needed, no shell restart needed**. To check the configuration, run any script (it prints the exact `.env` path if the key is missing).
+
+- ✅ Key already in `<skills-root>/.env` → proceed.
+- ❌ Key missing, or user just gave you a new key → go to the **adgine-geo-projects** skill, **Step 0**, which runs `python3 <skills-root>/setup.py <KEY>` to write the key into the correct `.env` file. **Never** write the key to `~/.zshrc`, `~/.bashrc`, Hermes global config, or any user-secrets store.
+
+> ⚠️ **IMPORTANT:** In all shell/exec commands, always reference the key as `$GEO_API_KEY` (the environment variable). Never hardcode the key value or use placeholder strings like `API_KEY=***` or `API_KEY=geo_sk_live_xxx` directly in a command — this will cause authentication failures.
+
+
+## Project selection
+
+```bash
+export GEO_PROJECT_ID=<project-id>   # session shortcut — resets when terminal closes
+# Run python3 scripts/list_projects.py from adgine-geo-projects skill to find your IDs
+```
+
+## Content lifecycle
+
+```
+Prompts selected → generate-titles → generate-outline (async) → approve outline → generate-article (async) → article ready → publish to WordPress
+```
+
+Content items progress through statuses: `draft` → `outline` → `article`.
+Each item also has a `publish_status`:
+- `unpublished` — article not yet pushed to WordPress (default after generation)
+- `published`   — article successfully published to WordPress
+
+---
+
+## Commands
+
+### List content items
+```bash
+python3 scripts/list_content.py [--project-id <id>] [--status draft|outline|article] \
+  [--publish-status unpublished|published] [--topic-id <id>] [--page 1] [--limit 20] [--json]
+```
+
+### Suggest article titles (quick, sync)
+```bash
+python3 scripts/generate_titles.py --topic-id <tid> --prompt-ids <id1,id2,...> \
+  [--project-id <id>]
+```
+Returns 5–10 AI-suggested article titles for the given topic and prompts.
+
+### Generate article outline (async, ~10–15 min)
+```bash
+python3 scripts/generate_outline.py --topic-id <tid> --prompt-ids <id1,id2,...> \
+  [--project-id <id>] [--title "Your chosen title"] \
+  [--reference-urls "https://url1,https://url2"] \
+  [--instructions "Additional guidance for the AI"]
+```
+Creates a content item with status `outline` once complete.
+
+> ⏳ **Expected duration: 10–15 minutes.** The script polls automatically (interval 10 s, timeout 20 min). Do NOT cancel early — this is a large LLM job.
+
+### Generate full article from outline (async, ~5–10 min)
+```bash
+python3 scripts/generate_article.py --content-id <cid> [--project-id <id>]
+```
+Content item must have status `outline`. Produces the full article.
+
+> ⏳ **Expected duration: 5–10 minutes.** The script polls automatically (interval 10 s, timeout 15 min). Do NOT cancel early.
+
+### Inspect & retry generation jobs
+
+The content pipeline runs three job types: the combined **workflow** job, the
+**outline** job, and the **article** job. They each have their own list/detail
+endpoints. Use `manage_jobs.py` to inspect or retry them.
+
+List jobs:
+```bash
+python3 scripts/manage_jobs.py list-workflow [--page 1] [--limit 20] [--json]
+python3 scripts/manage_jobs.py list-outline  [--page 1] [--limit 20] [--json]
+python3 scripts/manage_jobs.py list-article  [--page 1] [--limit 20] [--json]
+```
+
+Get job detail:
+```bash
+python3 scripts/manage_jobs.py get-workflow --job-id <id>
+python3 scripts/manage_jobs.py get-outline  --job-id <id>
+python3 scripts/manage_jobs.py get-article  --job-id <id>
+```
+
+Retry a failed workflow job:
+```bash
+python3 scripts/manage_jobs.py retry --job-id <id>
+```
+
+## Workflow
+
+See `WORKFLOW.md` for the detailed step-by-step content creation flow.
+
+## Output Format
+
+> ⚠️ **CRITICAL — Table cell content rule (must follow exactly):**
+> Tables use fenced code blocks with box-drawing borders. They only align correctly when **every cell contains ASCII characters exclusively**.
+> - **NEVER** put emoji inside table cells. They are 2 display units wide but count as 1 character, permanently misaligning all following columns.
+> - Emoji go ONLY on the label line **above** the ` ``` ` fence.
+> - Status in cells: `Draft` / `Outline` / `Article` (NOT 📝/📋/✅)
+
+---
+
+### When listing content (`list_content.py`)
+
+> 📄 **Content Library** — (Page 1 / N)
+
+📚 Items
+```
+┌────┬──────────┬───────┬────────────┬──────────────────────────────────────┐
+│  # │ Status   │ Words │ Pub.Status │ Title                                │
+├────┼──────────┼───────┼────────────┼──────────────────────────────────────┤
+│  1 │ Draft    │    —  │ Unpub      │ How to Improve Your SEO in 2025      │
+│  2 │ Outline  │    —  │ Unpub      │ Top 10 GEO Strategies for SaaS       │
+│  3 │ Article  │ 1,200 │ Published  │ What is Generative Engine Optimi...  │
+│  4 │ Article  │   850 │ Unpub      │ AI Search Trends for Marketers       │
+└────┴──────────┴───────┴────────────┴──────────────────────────────────────┘
+```
+- `Status`: content generation stage (`Draft` / `Outline` / `Article`)
+- `Words`: word count (`—` if not available)
+- `Pub.Status`: WordPress publish status (`Unpub` / `Published` / `—` if unknown)
+- Truncate long titles to ~36 chars with `...`.
+
+---
+
+### When suggesting titles (`generate_titles.py`)
+
+> 💡 **Suggested Titles** — pick one to generate an outline:
+
+💡 Title Options
+```
+┌────┬──────────────────────────────────────────────────────┐
+│  # │ Title                                                │
+├────┼──────────────────────────────────────────────────────┤
+│  1 │ How to Dominate AI Search in 2025                    │
+│  2 │ The Complete Guide to GEO for SaaS Companies         │
+│  3 │ Why Traditional SEO Is Not Enough Anymore            │
+└────┴──────────────────────────────────────────────────────┘
+```
+*Which title would you like to use for the outline?*
+
+---
+
+### When generating an outline (`generate_outline.py`)
+
+- Progress: `⏳ **Generating outline…** (~10–15 min)`
+- On completion, show the outline as a nested numbered list, then:
+
+✅ Outline Ready
+```
+┌────────────┬────────────────────────────────────┐
+│ Content ID │ <id>                               │
+│ Sections   │ 6                                  │
+│ Next step  │ generate_article.py -c <id>        │
+└────────────┴────────────────────────────────────┘
+```
+
+---
+
+### When generating an article (`generate_article.py`)
+
+- Progress: `⏳ **Writing article…** (~5–10 min)`
+- On completion:
+
+✅ Article Complete
+```
+┌────────────────┬────────────────────────────────────┐
+│ Title          │ <title>                            │
+│ Content ID     │ <id>                               │
+│ Word Count     │ ~1,200                             │
+│ Status         │ Article                            │
+│ Publish Status │ Unpub                              │
+└────────────────┴────────────────────────────────────┘
+```
+
+Then the **full article text** with `##`/`###` headings and bullet lists — never wrap article body in a code fence.
+
+---
+
+## Post-task recommendations
+
+After content operations, guide the user to the next stage:
+
+| You just… | → use skill (agent-internal) |
+|---|---|
+| Generated an outline | Review outline, then 生成完整文章 *(→ adgine-geo-content)*|
+| Generated a full article | 发布文章到 WordPress *(→ adgine-geo-wordpress)*|
+| Listed content items | 选择一篇生成 outline 或 article *(→ adgine-geo-content)*|
+| Checked job status / retried | 继续管理内容管线 *(→ adgine-geo-content)*|
+| Article published-ready | 检查文章页面的 AI 优化健康度 *(→ adgine-geo-performance)*|
+| Multiple articles ready | 对文章主题运行引用测试，验证效果 *(→ adgine-geo-citation)*|
+
+**⚠️ Output rule:** Do NOT write skill names (e.g. `adgine-geo-xxx`) in user-facing suggestions. Each suggestion must be phrased as a natural-language prompt the user can copy and send directly to the agent.
+
+> 💡 **建议下一步：**
+> 1. **[行动标题]** — *"[可直接发送给 AI 的自然语言提示词]"*
+> 2. **[行动标题]** — *"[可直接发送给 AI 的自然语言提示词]"*

package/skills/adgine-geo-content/WORKFLOW.md

@@ -0,0 +1,100 @@
+# Content Generation Workflow
+
+This guide walks through the complete GEO content creation pipeline, from prompts to a published-ready article.
+
+---
+
+## Prerequisites
+
+- **API key configured** — See [SETUP.md](../SETUP.md)
+- **Prompts** — You need prompt IDs. Generate them first with the **adgine-geo-topics** skill.
+- **Brand profile** — For best quality, ensure your brand profile is complete via the **adgine-geo-brand** skill.
+
+---
+
+## Step-by-step
+
+### Step 1 — Get topic and prompt IDs
+
+Use the **adgine-geo-topics** skill to list topics and prompts:
+
+```bash
+# From adgine-geo-topics/ skill directory:
+python3 scripts/manage_topics.py list
+python3 scripts/manage_prompts.py list --topic-id <topic-id>
+```
+
+Note: gather the `topic_id` and the prompt `id` values you want to use.
+
+---
+
+### Step 2 — (Optional) Suggest article titles
+
+```bash
+python3 scripts/generate_titles.py \
+  --topic-id <tid> \
+  --prompt-ids "prompt-id-1,prompt-id-2,prompt-id-3"
+```
+
+Returns AI-suggested titles. Pick one or write your own.
+
+---
+
+### Step 3 — Generate article outline
+
+```bash
+python3 scripts/generate_outline.py \
+  --topic-id <tid> \
+  --prompt-ids "prompt-id-1,prompt-id-2,prompt-id-3" \
+  --title "Your Chosen Article Title" \
+  --instructions "Emphasize cost-saving benefits, target CMO audience"
+```
+
+This creates a content item (status: `outline`) and polls until complete (~30–90 s).
+The script prints the outline on completion and shows the `content_id`.
+
+---
+
+### Step 4 — Review the outline
+
+```bash
+python3 scripts/list_content.py --status outline
+```
+
+Review the generated outline. If needed, you can edit it:
+- Contact your geo-platform dashboard to edit outline content
+- Or proceed to article generation using the existing outline
+
+---
+
+### Step 5 — Generate the full article
+
+```bash
+python3 scripts/generate_article.py --content-id <content-id>
+```
+
+Polls until the article is complete (~60–180 s). Prints the article on completion.
+
+---
+
+### Step 6 — Review the article
+
+```bash
+python3 scripts/list_content.py --status article
+```
+
+The full article is ready in `full_content` (Markdown format). It includes:
+- Article body
+- FAQ section
+- Citation opportunities analysis
+- SEO metadata (title, description, slug)
+- Word count
+
+---
+
+## Tips
+
+- **Multiple articles**: Run steps 3–5 in parallel with different topics/prompts.
+- **Re-generation**: Delete a content item with status `draft` or `outline` and start over.
+- **Custom instructions**: Use `--instructions` in `generate_outline.py` to guide tone, audience, and structure.
+- **Reference URLs**: Pass competitor or reference URLs via `--reference-urls` for better-informed outlines.

package/skills/adgine-geo-content/scripts/_client.py

@@ -0,0 +1,341 @@
+#!/usr/bin/env python3
+"""Shared HTTP client utilities for geo-skills scripts.
+
+Used by all scripts in this skill. Uses Python stdlib only — no external dependencies.
+
+This file is the canonical source. It must be copied verbatim into every
+adgine-geo-* skill folder's scripts/ directory. The sync linter at
+scripts/sync-skills/sync-skills.sh (in the GEOAgent repo) flags any drift.
+"""
+import os
+import sys
+import json
+import time
+import atexit
+import unicodedata
+import urllib.request as _req
+import urllib.error as _uerr
+import urllib.parse as _up
+
+def _load_dot_env():
+    """Load .env from the repo root (adgine-geo-skills/) into os.environ.
+
+    Resolved relative to this file's location, so it works regardless of the
+    agent's working directory (e.g. Hermes, OpenClaw, or any other runtime).
+    Existing environment variables are never overwritten.
+    """
+    if os.environ.get("GEO_API_KEY"):
+        return
+    # _client.py is at <repo_root>/adgine-geo-<skill>/scripts/_client.py
+    repo_root = os.path.dirname(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    )
+    env_path = os.path.join(repo_root, ".env")
+    if not os.path.isfile(env_path):
+        return
+    with open(env_path) as _f:
+        for _line in _f:
+            _line = _line.strip()
+            if not _line or _line.startswith("#") or "=" not in _line:
+                continue
+            _k, _, _v = _line.partition("=")
+            _k = _k.strip()
+            _v = _v.strip()
+            if _k and _k not in os.environ:
+                os.environ[_k] = _v
+
+
+_load_dot_env()
+
+_VERSION_UNCHECKED = object()
+_version_state = _VERSION_UNCHECKED
+
+
+def _repo_root():
+    return os.path.dirname(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    )
+
+
+def _load_check_version_module():
+    import importlib.util
+    path = os.path.join(_repo_root(), "scripts", "check_version.py")
+    if not os.path.isfile(path):
+        return None
+    spec = importlib.util.spec_from_file_location("geo_check_version", path)
+    mod = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
+    return mod
+
+
+def _load_version_state():
+    global _version_state
+    if _version_state is not _VERSION_UNCHECKED:
+        return _version_state
+    _version_state = None
+    try:
+        mod = _load_check_version_module()
+        if mod is not None:
+            _version_state = mod.get_state()
+    except Exception:
+        pass
+    return _version_state
+
+
+def _print_version_notice():
+    """Emit machine + human hints at import if a newer version exists."""
+    state = _load_version_state()
+    if not state or not state.get("update_available"):
+        return
+    cur, lat = state["current"], state["latest"]
+    try:
+        mod = _load_check_version_module()
+        if mod is not None:
+            inline = mod.format_user_inline(state)
+            if inline:
+                sys.stdout.write(inline + "\n\n")
+                sys.stdout.flush()
+    except Exception:
+        pass
+    if state.get("install_type") == "git":
+        msg = (f"adgine-geo-skills {lat} available (current {cur}). "
+               "Tell me: 请帮我更新 adgine-geo-skills 到最新版本")
+    else:
+        msg = (f"adgine-geo-skills {lat} available (current {cur}). "
+               f"Download: {state.get('release_url', '')}")
+    notice = {"update": {"current": cur, "latest": lat, "message": msg}}
+    try:
+        line = f"_notice: {json.dumps(notice, ensure_ascii=False)}\n\n"
+        sys.stdout.write(line)
+        sys.stdout.flush()
+    except Exception:
+        pass
+
+
+def _print_version_footer():
+    """Emit human-readable footer at process exit (WorkBuddy-compatible)."""
+    state = _load_version_state()
+    if not state or not state.get("update_available"):
+        return
+    try:
+        mod = _load_check_version_module()
+        if mod is None:
+            return
+        footer = mod.format_user_footer(state)
+        if footer:
+            sys.stdout.write("\n" + footer + "\n")
+            sys.stdout.flush()
+    except Exception:
+        pass
+
+
+_print_version_notice()
+atexit.register(_print_version_footer)
+
+
+def get_api_config():
+    """Read GEO_API_KEY and GEO_API_BASE_URL from environment.
+
+    Exits with a helpful message if GEO_API_KEY is not set.
+    Returns (key, base_url).
+    """
+    key = os.environ.get("GEO_API_KEY", "")
+    base = os.environ.get("GEO_API_BASE_URL", "https://platform.adgine.ai").rstrip("/")
+    if not key:
+        repo_root = os.path.dirname(
+            os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        )
+        env_path = os.path.join(repo_root, ".env")
+        example_path = os.path.join(repo_root, ".env.example")
+        setup_path = os.path.join(repo_root, "setup.py")
+        print("ERROR: GEO_API_KEY is not set.")
+        print(f"  Expected location: {env_path}")
+        print()
+        print("  One-shot fix (recommended):")
+        print(f"    python3 {setup_path} <YOUR_KEY>")
+        print()
+        print("  Or set it manually:")
+        if not os.path.isfile(env_path):
+            print(f"    cp {example_path} {env_path}")
+        print(f"    edit {env_path} and set GEO_API_KEY=geo_sk_live_xxx")
+        print()
+        print("  Get your key at: https://platform.adgine.ai")
+        print("  The .env file is gitignored — your key stays local and private.")
+        print()
+        print("  NOTE: adgine-geo-site-audit does NOT require an API key.")
+        print("    Run directly: python3 adgine-geo-site-audit/scripts/geo_collect.py <url>")
+        sys.exit(1)
+    return key, base
+
+
+def get_project_id(arg_value=None):
+    """Resolve project ID from argument or GEO_PROJECT_ID env var.
+
+    Exits with instructions if neither is set.
+    """
+    pid = arg_value or os.environ.get("GEO_PROJECT_ID", "")
+    if not pid:
+        print("ERROR: Project ID is required but not set.")
+        print("  Option 1: export GEO_PROJECT_ID=<project-id>")
+        print("  Option 2: pass --project-id <id> to this script")
+        print("  Run list_projects.py from the adgine-geo-projects skill to see your available projects.")
+        sys.exit(1)
+    return pid
+
+
+def _do_request(method, url, key, body=None, timeout=30):
+    """Execute an HTTP request and return parsed JSON.
+
+    Exits with an error message on HTTP errors or network failures.
+    """
+    data = json.dumps(body).encode("utf-8") if body is not None else None
+    headers = {
+        "Authorization": f"Bearer {key}",
+        "Content-Type": "application/json",
+        "Accept": "application/json",
+        "User-Agent": "geo-skills/1.0",
+    }
+    request = _req.Request(url, data=data, headers=headers, method=method)
+    try:
+        with _req.urlopen(request, timeout=timeout) as resp:
+            raw = resp.read().decode("utf-8")
+            return json.loads(raw) if raw else {}
+    except _uerr.HTTPError as e:
+        raw = e.read().decode("utf-8")[:400]
+        try:
+            err_data = json.loads(raw)
+            msg = err_data.get("message") or err_data.get("detail") or raw
+        except Exception:
+            msg = raw
+        if e.code == 401:
+            print("ERROR: Unauthorized — API key is invalid or revoked.")
+            print("  Generate a new key: https://platform.adgine.ai")
+        elif e.code == 403:
+            print("ERROR: Forbidden — insufficient permissions for this operation.")
+        elif e.code == 404:
+            print(f"ERROR: Not found — {msg}")
+        else:
+            print(f"ERROR: HTTP {e.code} — {msg}")
+        sys.exit(1)
+    except Exception as e:
+        print(f"ERROR: Request failed — {e}")
+        sys.exit(1)
+
+
+def api_get(path, key, base, params=None, timeout=30):
+    url = f"{base}{path}"
+    if params:
+        clean = {k: str(v) for k, v in params.items() if v is not None}
+        if clean:
+            url += "?" + _up.urlencode(clean)
+    return _do_request("GET", url, key, timeout=timeout)
+
+
+def api_post(path, key, base, body=None, timeout=30):
+    return _do_request("POST", f"{base}{path}", key, body, timeout=timeout)
+
+
+def api_patch(path, key, base, body=None, timeout=30):
+    return _do_request("PATCH", f"{base}{path}", key, body, timeout=timeout)
+
+
+def api_put(path, key, base, body=None, timeout=30):
+    return _do_request("PUT", f"{base}{path}", key, body, timeout=timeout)
+
+
+def api_delete(path, key, base, timeout=30):
+    return _do_request("DELETE", f"{base}{path}", key, timeout=timeout)
+
+
+def extract_data(result):
+    """Extract the .data field from a standard geo-api envelope response.
+
+    On success the API returns {"code": 0, "data": <payload>, "message": "ok"}.
+    On non-zero code, this prints the message and exits(1).
+    """
+    if not isinstance(result, dict):
+        return result
+    if "code" in result and result.get("code") not in (0, None):
+        msg = result.get("message") or result.get("detail") or "request failed"
+        print(f"ERROR: API returned code={result.get('code')} — {msg}")
+        sys.exit(1)
+    return result.get("data", result)
+
+
+def poll_job(status_path, key, base, interval=3, max_wait=300,
+             terminal=("completed", "failed", "done", "success", "error")):
+    """Poll a job/task endpoint until it reaches a terminal state.
+
+    Prints an inline spinner with the current phase. Returns the final job dict.
+    """
+    elapsed = 0
+    frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
+    idx = 0
+    last_job = {}
+    while elapsed < max_wait:
+        result = api_get(status_path, key, base)
+        last_job = extract_data(result) or {}
+        status = (last_job.get("status") or "").lower()
+        phase = last_job.get("current_phase") or last_job.get("phase") or status or "pending"
+        print(f"\r  {frames[idx % len(frames)]} {phase}... ({elapsed}s)", end="", flush=True)
+        idx += 1
+        if status in terminal:
+            print()  # newline after spinner
+            return last_job
+        time.sleep(interval)
+        elapsed += interval
+    print()
+    print(f"WARNING: Job is still running after {max_wait}s. Check status manually.")
+    return last_job
+
+
+def print_json(data):
+    """Print data as formatted JSON (UTF-8 safe)."""
+    print(json.dumps(data, ensure_ascii=False, indent=2))
+
+
+def fmt_change(value):
+    """Format a numeric change indicator per CONVENTIONS.md §4.
+
+    Returns: '+N' / '-N' / '0' / '--' (None becomes '--').
+    """
+    if value is None:
+        return "--"
+    try:
+        n = float(value)
+    except (TypeError, ValueError):
+        return "--"
+    if n == 0:
+        return "0"
+    sign = "+" if n > 0 else ""
+    if n == int(n):
+        return f"{sign}{int(n):,}"
+    return f"{sign}{n:,.1f}"
+
+
+def truncate(text, n=60, ellipsis="…"):
+    """Truncate text to n characters, adding ellipsis if cut. ASCII-safe for tables."""
+    if text is None:
+        return "--"
+    s = str(text)
+    if len(s) <= n:
+        return s
+    return s[: max(0, n - len(ellipsis))] + ellipsis
+
+def display_width(s):
+    """Return the display width of a string (CJK chars count as 2 columns)."""
+    w = 0
+    for c in str(s):
+        eaw = unicodedata.east_asian_width(c)
+        w += 2 if eaw in ('W', 'F') else 1
+    return w
+
+
+def pad(s, width, align='left'):
+    """Pad string to display width for CJK-aware table alignment.
+    Replaces f'{s:<N}' (align='left') and f'{s:>N}' (align='right').
+    """
+    s = str(s)
+    dw = display_width(s)
+    spaces = max(0, width - dw) * ' '
+    return spaces + s if align == 'right' else s + spaces