task-ledger 1.3.3 → 1.3.5

package/scripts/ledgerkit/core/history_md.py

@@ -1,14 +1,12 @@
-"""历史表格的文本操作：拼行、解析、旧列数升级。
+"""历史表格的文本操作：拼九列一行、解析九列一行。
 
-**自己不开文件**：升级要回链 worklog 读头部，那件事由调用方传 `read_worklog`
-回调进来（`str -> str | None`），core 只做文本换算。
+**只认九列这一种格式**（开发期没发布，不做任何旧列数 / 旧列语义的迁移）。
 """
 
 from __future__ import annotations
 
 import re
-from collections.abc import Callable, Iterable
-from pathlib import Path
+from collections.abc import Iterable
 from typing import Any
 
 from .paths import to_history_rel
@@ -18,8 +16,6 @@ HISTORY_TITLE = "# 进度历史（已结案）"
 HISTORY_HEADER = "| 结案时间 | 创建时间 | 工作包 | 分类 | 标签 | owner | creator | 完成了什么 | 过程文档 |"
 HISTORY_SEP = "|---|---|---|---|---|---|---|---|---|"
 
-# 最旧格式把 owner 缝在工作包末尾：最右一个「空格 + @」之后整段是 owner。
-OLD_OWNER_RE = re.compile(r"^(?P<title>.*\S)\s+@(?P<owner>\S.*)$")
 _LINK_RE = re.compile(r"\[[^\]]*\]\(([^)]*)\)")
 _TAG_SPLIT_RE = re.compile(r"[,，、]")
 
@@ -32,7 +28,7 @@ def esc_cell(text: str) -> str:
 
 
 def owner_cell(owner: str | None) -> str:
-    """owner 列的展示值：人名前加 @（`@` 只是展示约定，匹配一律用裸标识）。"""
+    """owner 列的展示值：人名前加 @（`@` 只是展示约定，匹配一律用裸 uuid）。"""
     return f"@{owner}" if owner else ""
 
 
@@ -56,7 +52,6 @@ def is_sep_row(cells: list[str]) -> bool:
 
 
 def _looks_like_header(cells: list[str]) -> bool:
-    # 按内容判、不按位置判：无表头的老文件首行就是数据，按位置判会把第一条记录当表头删掉。
     return bool(cells) and cells[0] in ("时间", "结案时间")
 
 
@@ -73,7 +68,7 @@ def history_line(
 ) -> str:
     """九列的一行。`worklog` 收**相对 `ledger/`** 的路径，这里负责换成相对 `history/` 的链接。
 
-    owner / creator 传**裸标识**（`@` 由 owner_cell / creator_cell 加），外面别先加。
+    owner / creator 传**裸 uuid**（`@` 由 owner_cell / creator_cell 加），外面别先加。
     """
     log_rel = to_history_rel(worklog) if worklog else ""
     tag_cell = esc_cell("、".join(tags) if tags else "")
@@ -86,66 +81,11 @@ def history_line(
     )
 
 
-def history_line_for_cols(
-    cols: int,
-    finished: str,
-    created: str | None,
-    title: str,
-    owner: str | None,
-    summary: str,
-    worklog: str | None,
-    category: str | None = None,
-    tags: Iterable[str] | None = None,
-    creator: str | None = None,
-) -> str:
-    """「历史层有无法解析的行、不敢整体升级」时按现有列数追加一行，避免列错位。
-
-    GFM 按首行列数渲染，列数写错会被静默丢弃 / 错位。少列的文件硬塞 9 列会把整行挤歪。
-    """
-    log_rel = to_history_rel(worklog) if worklog else ""
-    link = f"[{log_rel}]({log_rel})" if log_rel else ""
-    if cols <= 4:
-        who = f" @{owner}" if owner else ""
-        return (
-            f"| {finished} | {esc_cell(title + who)} | {esc_cell(summary)} | {link} |\n"
-        )
-    if cols == 5:
-        return (
-            f"| {finished} | {esc_cell(title)} | {esc_cell(owner_cell(owner))} "
-            f"| {esc_cell(summary)} | {link} |\n"
-        )
-    if cols == 6:
-        return (
-            f"| {finished} | {created or ''} | {esc_cell(title)} "
-            f"| {esc_cell(owner_cell(owner))} | {esc_cell(summary)} | {link} |\n"
-        )
-    return history_line(
-        finished, created, title, owner, summary, worklog, category, tags, creator
-    )
-
-
-def history_cols(text: str) -> int:
-    """现有历史表格数据行的列数（取众数、平局取较大）；无数据行时按 6。"""
-    counts: dict[int, int] = {}
-    for raw in text.splitlines():
-        if not raw.strip().startswith("|"):
-            continue
-        cells = split_row(raw)
-        if not cells or is_sep_row(cells) or _looks_like_header(cells):
-            continue
-        if len(cells) >= 4:
-            counts[len(cells)] = counts.get(len(cells), 0) + 1
-    if not counts:
-        return 6
-    return max(counts, key=lambda k: (counts[k], k))
-
-
 def parse_history(text: str) -> tuple[list[Row], list[str]]:
-    """解析历史表 → (records, warnings)。**逐行按自己的列数判别**，表头只用来跳过。
+    """解析九列历史表 → (records, warnings)。坏行（列数不对 / 时间列不合法）跳过并警告。
 
-    兼容 9 / 8 / 6 / 5（两种）/ 4 列；坏行（列数不在列、时间列不合法）跳过并警告，不中断。
     返回的键：finished / created / title / category / tags / owner / creator / summary /
-    worklog / fmt / line。owner 与 creator 一律**剥掉 `@`**（匹配用裸标识）。
+    worklog / fmt / line。owner 与 creator 一律**剥掉 `@`**（存储值是裸 uuid）。
     """
     records: list[Row] = []
     warnings: list[str] = []
@@ -155,196 +95,31 @@ def parse_history(text: str) -> tuple[list[Row], list[str]]:
         cells = split_row(raw)
         if not cells or is_sep_row(cells) or _looks_like_header(cells):
             continue
-        created = ""
-        category: str | None = None
-        tags: list[str] = []
-        creator: str | None = None
-        if len(cells) == 9:
-            (
-                finished,
-                created,
-                title,
-                category,
-                tag_cell,
-                owner,
-                creator,
-                summary,
-                doc,
-            ) = cells
-            fmt = "v9"
-            category = category.strip() or None
-            tags = [t.strip() for t in _TAG_SPLIT_RE.split(tag_cell) if t.strip()]
-            creator = creator.strip().removeprefix("@") or None
-        elif len(cells) == 8:
-            finished, created, title, category, tag_cell, owner, summary, doc = cells
-            fmt = "v8"
-            category = category.strip() or None
-            tags = [t.strip() for t in _TAG_SPLIT_RE.split(tag_cell) if t.strip()]
-        elif len(cells) == 6:
-            finished, created, title, owner, summary, doc = cells
-            fmt = "v6"
-        elif len(cells) == 5 and TIME_RE.fullmatch(cells[1]):
-            # 旧 ledger 格式（结案 / 创建 / 工作包 / 摘要 / 文档）：行内自带创建时间。
-            finished, created, title, summary, doc = cells
-            owner = ""
-            fmt = "v5ledger"
-        elif len(cells) == 5:
-            finished, title, owner, summary, doc = cells
-            fmt = "v5"
-        elif len(cells) == 4:
-            finished, title, summary, doc = cells
-            m = OLD_OWNER_RE.match(title)
-            owner = m.group("owner") if m else ""
-            if m:
-                title = m.group("title")
-            fmt = "v4"
-        else:
-            warnings.append(f"第 {lineno} 行列数不是 4 / 5 / 6 / 8 / 9，已跳过")
+        if len(cells) != 9:
+            warnings.append(f"第 {lineno} 行不是九列（历史表只认九列），已跳过")
             continue
+        finished, created, title, category, tag_cell, owner, creator, summary, doc = (
+            cells
+        )
         if not TIME_RE.fullmatch(finished):
             warnings.append(f"第 {lineno} 行时间列 {finished!r} 不合法，已跳过")
             continue
         m = _LINK_RE.fullmatch(doc.strip())
-        log = m.group(1) if m else doc.strip()
         records.append(
             {
                 "finished": finished,
                 "created": time_key(created) if created else None,
                 "title": title,
-                "category": category,
-                "tags": tuple(tags),
-                "owner": (owner or "").strip().removeprefix("@") or None,
-                "creator": creator,
+                "category": category.strip() or None,
+                "tags": tuple(
+                    t.strip() for t in _TAG_SPLIT_RE.split(tag_cell) if t.strip()
+                ),
+                "owner": owner.strip().removeprefix("@") or None,
+                "creator": creator.strip().removeprefix("@") or None,
                 "summary": summary,
-                "worklog": log or None,
-                "fmt": fmt,
+                "worklog": (m.group(1) if m else doc.strip()) or None,
+                "fmt": "v9",
                 "line": lineno,
             }
         )
     return records, warnings
-
-
-def _drop_trailing_blank(out: list[str]) -> None:
-    """去掉已在结果里的尾部空行（丢弃重复表头时用）：中间的空行会把 GFM 表格截断。"""
-    while out and not out[-1].strip():
-        out.pop()
-
-
-def upgrade_history(
-    text: str,
-    *,
-    read_worklog: Callable[[str], dict[str, Any] | None],
-    fallback_created: str,
-) -> tuple[str, int] | None:
-    """旧格式（4 / 5 / 6 / 8 列）→ v9。**全部数据行可解析才返回 (新文本, 转换行数)**，否则 None。
-
-    `None` 的语义是「不敢动」：调用方必须退回 `history_line_for_cols` 按原列数追加并明示，
-    绝不半升级、绝不猜。分类 / 标签 / creator / 缺的创建时间都靠 `read_worklog` 回链补，
-    读不到就留空（创建时间除外：留空会让排序失效，所以退化到 `fallback_created`）。
-
-    `read_worklog` 的契约：`(log_name: str) -> dict | None` —— 收**文件名**（历史末列的
-    basename，不是路径），返回 `{"created", "creator", "category", "tags"}`。core 只消费
-    返回值，自己不开文件。
-    """
-    out: list[str] = []
-    converted = 0
-    seen_header = False
-    seen_sep = False
-    for raw in text.splitlines():
-        if not raw.strip().startswith("|"):
-            out.append(raw)
-            continue
-        cells = split_row(raw)
-        if not cells:
-            out.append(raw)
-            continue
-        if is_sep_row(cells):
-            if seen_sep:
-                _drop_trailing_blank(out)
-                continue
-            seen_sep = True
-            out.append(HISTORY_SEP)
-            continue
-        if _looks_like_header(cells):
-            if seen_header:
-                _drop_trailing_blank(out)
-                continue
-            seen_header = True
-            out.append(HISTORY_HEADER)
-            continue
-        if len(cells) == 9:
-            if time_key(cells[0]) is None:
-                return None
-            out.append("| " + " | ".join(cells) + " |")
-            continue
-        explicit_created: str | None = None
-        creator: str | None = None
-        if len(cells) == 8:
-            finished, created, title, category, tag_cell, owner, summary, doc = cells
-            if time_key(finished) is None:
-                return None
-            created_key = time_key(created.strip())
-            tags = [t.strip() for t in _TAG_SPLIT_RE.split(tag_cell) if t.strip()]
-            creator = (_meta_of(doc, read_worklog) or {}).get("creator")
-            out.append(
-                f"| {finished} | {created_key or ''} | {esc_cell(title)} "
-                f"| {esc_cell(category.strip())} "
-                f"| {esc_cell('、'.join(tags) if tags else '')} "
-                f"| {esc_cell(owner_cell(owner.lstrip('@')))} "
-                f"| {esc_cell(creator_cell(creator))} "
-                f"| {esc_cell(summary)} | {doc} |"
-            )
-            converted += 1
-            continue
-        if len(cells) == 6:
-            finished, created, title, owner, summary, doc = cells
-            owner = owner.lstrip("@")
-            explicit_created = time_key(created.strip())
-        elif len(cells) == 5 and TIME_RE.fullmatch(cells[1]):
-            finished, created_cell, title, summary, doc = cells
-            owner = ""
-            explicit_created = time_key(created_cell.strip())
-        elif len(cells) == 5:
-            finished, title, owner, summary, doc = cells
-            owner = owner.lstrip("@")
-        elif len(cells) == 4:
-            finished, title, summary, doc = cells
-            m = OLD_OWNER_RE.match(title)
-            owner = m.group("owner") if m else ""
-            if m:
-                title = m.group("title")
-        else:
-            return None
-        finished_key = time_key(finished)
-        if finished_key is None:
-            return None
-        meta = _meta_of(doc, read_worklog)
-        created = explicit_created or (meta or {}).get("created") or fallback_created
-        category = (meta or {}).get("category")
-        tags = tuple((meta or {}).get("tags") or ())
-        creator = (meta or {}).get("creator")
-        out.append(
-            f"| {finished_key} | {created} | {esc_cell(title)} "
-            f"| {esc_cell(category or '')} "
-            f"| {esc_cell('、'.join(tags) if tags else '')} "
-            f"| {esc_cell(owner_cell(owner))} "
-            f"| {esc_cell(creator_cell(creator))} "
-            f"| {esc_cell(summary)} | {doc} |"
-        )
-        converted += 1
-    return "\n".join(out) + "\n", converted
-
-
-def _link_target(cell: str) -> str:
-    m = _LINK_RE.fullmatch((cell or "").strip())
-    return (m.group(1) if m else (cell or "")).strip()
-
-
-def _meta_of(
-    doc: str, read_worklog: Callable[[str], dict[str, Any] | None]
-) -> dict[str, Any] | None:
-    """顺着历史行的文档链接取回 worklog 头部四样（`read_worklog` 收文件名）。"""
-    target = _link_target(doc)
-    if not target:
-        return None
-    return read_worklog(Path(target).name)

package/scripts/ledgerkit/core/identity.py

@@ -1,20 +1,28 @@
-"""身份这个值对象：归一化与比较规则。**只做字符串换算，不读 git**（读 git 归 env.py）。"""
+"""身份这个值对象：uuid 是唯一键，name 只用于显示与查询筛选。
+
+**只做字符串换算，不读文件**（读身份归 env.py）。名字永远不参与归属判定：
+认领 / 释放 / 交接 / 查「我的」，一律只比 uuid。
+"""
 
 from __future__ import annotations
 
+import re
 from dataclasses import dataclass
 
+#: 合法身份键的形态（8-4-4-4-12 的十六进制 UUID）。`--owner` 只收这种值。
+UUID_RE = re.compile(r"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$")
+
 
 @dataclass(frozen=True)
 class Identity:
-    """一个人的身份。`email` 是分区键（归一化后的裸标识），`name` 只用于显示。"""
+    """一个人的身份。`uuid` 是唯一键，`name` 只用于显示。"""
 
-    email: str
+    uuid: str
     name: str = ""
 
     def label(self) -> str:
-        """显示名：没名字就用邮箱。"""
-        return self.name or self.email
+        """显示名：没名字就用 uuid 前 8 位。"""
+        return self.name or self.uuid[:8]
 
 
 def normalize(who: str) -> str:
@@ -22,6 +30,11 @@ def normalize(who: str) -> str:
     return (who or "").strip().lower()
 
 
+def looks_like_uuid(who: str | None) -> bool:
+    """是不是一个 UUID 形态的身份键（名字、邮箱一律 False）。"""
+    return bool(UUID_RE.match(normalize(who or "")))
+
+
 def is_me(identity: Identity, who: str | None) -> bool:
-    """`who`（邮箱）是不是这个人。全站只认邮箱这一个身份键。"""
-    return normalize(who or "") == normalize(identity.email)
+    """`who`（uuid）是不是这个人。全站只认 uuid 这一个身份键。"""
+    return normalize(who or "") == normalize(identity.uuid)

package/scripts/ledgerkit/core/labels.py

@@ -8,7 +8,6 @@ from collections.abc import Iterable
 from ..errors import Fail
 
 STATUSES = ("open", "doing")
-LEGACY_STATUSES = ("blocked",)  # 旧数据：读侧当进行中，不写回
 FORMAT_VERSION = "20261022000000"
 
 LABEL_MAX_CHARS = 4  # 含 CJK 时按「字」算

package/scripts/ledgerkit/core/paths.py

@@ -20,7 +20,6 @@ OWNERS_REL = Path("owners.json")
 OWNERS_DIR = Path("owners")
 HISTORY_DIR = Path("history")
 WORKLOG_DIR = Path("worklog")
-LEGACY_HISTORY_REL = Path("PROGRESS-HISTORY.md")  # 存量平铺文件：只读不写
 
 SHA_LEN = 12
 

package/scripts/ledgerkit/env.py

@@ -1,93 +1,92 @@
-"""唯一允许去问 git「我现在是谁」的地方。
+"""确定「我是谁」的唯一地方：只读机器级身份文件，不读 git、不读环境变量。
 
-只**读**配置（`GIT_COMMITTER_IDENT` / `config user.email` / `config user.name`），
-不 pull、不 commit、不 push —— 那不算 git 操作，算环境。
-兜底身份这件事本身只 `notices.note("提示：…")`，不打印。
+身份文件：`$TASK_LEDGER_HOME/.taskledger/identity.json`（默认 `~/.taskledger/identity.json`），
+内容是 `{"uuid": "...", "name": "..."}`。没有就报错，由 `init` 命令创建。
 """
 
 from __future__ import annotations
 
-import getpass
+import json
 import os
-import re
-import socket
-import subprocess
 from pathlib import Path
 
-from . import notices
-from .core.identity import Identity, normalize
+from .core.identity import Identity, looks_like_uuid, normalize
+from .errors import Fail
 
-_IDENT_RE = re.compile(r"<([^>]*)>")
+IDENTITY_HOME_ENV = "TASK_LEDGER_HOME"
 
 
-def _git(*args: str) -> subprocess.CompletedProcess[str]:
-    return subprocess.run(["git", *args], capture_output=True, text=True, check=False)
+def identity_file() -> Path:
+    """机器级身份文件路径；`TASK_LEDGER_HOME` 可覆写主目录（容器/测试用）。"""
+    base = os.environ.get(IDENTITY_HOME_ENV)
+    if base:
+        return Path(base) / ".taskledger" / "identity.json"
+    try:
+        home = Path.home()
+    except RuntimeError as exc:
+        raise Fail(
+            "找不到用户主目录（HOME）。\n"
+            "  处理：设置环境变量 TASK_LEDGER_HOME 指向一个可写目录，再重试。"
+        ) from exc
+    return home / ".taskledger" / "identity.json"
 
 
-def git_value(repo: Path | None, *args: str) -> str | None:
-    """读一个 git 配置值；cwd 给定时按那个仓库判（--repo 未必是当前目录）。
+def read_identity() -> Identity | None:
+    """读机器身份；文件不存在、空文件、坏 JSON、没 uuid 一律返回 None。
 
-    没装 git 二进制不算故障：当「读不到」处理，走兜底身份（2026-10-24：
-    以前直接 FileNotFoundError 崩，没 git 的机器连台账都建不起来）。
+    uuid 先归一化（去空白 + 小写，与 `--owner` 入参同一口径）。**形态不对直接报错**：
+    身份键只能是 uuid，手改进去一个邮箱 / 名字会让每条命令都写错 owner，
+    与其静默用下去，不如当场停下让人改文件。
     """
-    base = ("git", "-C", str(repo)) if repo is not None else ("git",)
+    path = identity_file()
     try:
-        proc = subprocess.run(
-            [*base, *args], capture_output=True, text=True, check=False
-        )
-    except FileNotFoundError:
+        raw = path.read_text(encoding="utf-8")
+    except (OSError, ValueError):
         return None
-    if proc.returncode == 0 and proc.stdout.strip():
-        return proc.stdout.strip()
-    return None
-
-
-def git_email(repo: Path | None) -> str | None:
-    """GIT_COMMITTER_IDENT 优先，退回 user.email。"""
-    ident = git_value(repo, "var", "GIT_COMMITTER_IDENT")
-    if ident:
-        m = _IDENT_RE.search(ident)
-        if m and m.group(1).strip():
-            return m.group(1).strip()
-    return git_value(repo, "config", "user.email")
-
-
-def git_name(repo: Path | None) -> str | None:
-    ident = git_value(repo, "var", "GIT_COMMITTER_IDENT")
-    if ident:
-        head = ident.split("<", 1)[0].strip()
-        if head:
-            return head
-    return git_value(repo, "config", "user.name")
-
-
-def fallback_identity() -> str:
-    """不在 git 仓库里时的兜底链：系统用户名 → getpass → 主机名 → 字面 default。"""
-    for key in ("USER", "LOGNAME"):
-        value = os.environ.get(key, "").strip()
-        if value:
-            return value
-    try:
-        name = getpass.getuser().strip()
-    except Exception:  # noqa: BLE001 —— 拿不到用户名是正常分支，不该炸
-        name = ""
-    if name:
-        return name
     try:
-        host = socket.gethostname().strip()
-    except OSError:
-        host = ""
-    return host or "default"
+        data = json.loads(raw)
+    except ValueError:
+        return None
+    uuid = normalize(str((data or {}).get("uuid") or ""))
+    if not uuid:
+        return None
+    if not looks_like_uuid(uuid):
+        raise Fail(
+            f"身份文件里的 uuid 不合法：{path}\n"
+            f"  读到：{uuid}（身份键只能是 uuid，不能是邮箱 / 名字）\n"
+            "  处理：把该文件的 uuid 改成 uuid（或删掉这个文件重跑 init）。"
+        )
+    name = str((data or {}).get("name") or "").strip()
+    return Identity(uuid=uuid, name=name)
 
 
 def current(repo: Path | None = None) -> Identity:
-    """当前操作者。邮箱与名字取不到都给兜底，并留一条提示（不打印）。"""
-    email = git_email(repo)
-    if not email:
-        email = fallback_identity()
-        notices.note(
-            f"提示：读不到 git 身份（user.email），本次按兜底身份 {email!r} 记账；"
-            "配好 git config user.email 再跑，任务才会记到正确的名下。"
+    """当前操作者；没初始化就报错，提示去 init。
+
+    name 的取值规则：工作区 owners.json 里同 uuid 的 name 优先，没有就用总体的 name。
+    """
+    identity = read_identity()
+    if identity is None:
+        raise Fail(
+            "这台机器还没有初始化身份。\n"
+            "  处理：先运行 `progress.py init --repo <工作区根>`，输入一个名字，再执行本命令。"
         )
-    name = git_name(repo) or email
-    return Identity(email=normalize(email), name=name.strip())
+    name = identity.name
+    if repo is not None:
+        name = _workspace_name(repo, identity.uuid) or name
+    return Identity(uuid=identity.uuid, name=name)
+
+
+def _workspace_name(repo: Path, uuid: str) -> str:
+    """当前工作区 owners.json 里这个 uuid 的 name；没有/读不到返回空串。"""
+    from .core.paths import OWNERS_REL, to_repo_rel
+
+    try:
+        raw = (repo / to_repo_rel(OWNERS_REL)).read_text(encoding="utf-8")
+        workers = (json.loads(raw) or {}).get("workers", {}) or {}
+    except (OSError, ValueError):
+        return ""
+    record = workers.get(uuid) or workers.get(uuid.lower())
+    if not isinstance(record, dict):
+        return ""
+    return str(record.get("name") or "").strip()