dsh-task-ledger 0.0.78 → 0.0.80

package/skill/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()

package/skill/scripts/ledgerkit/shell/cli.py

@@ -47,7 +47,8 @@ def build_parser() -> argparse.ArgumentParser:
 
     setp = sub.add_parser("set", help="释放 / 交接任务")
     setp.add_argument("--id", required=True, dest="tid")
-    setp.add_argument("--owner")
+    setp.add_argument("--owner", help="交给别人的 uuid（交接）")
+    setp.add_argument("--release", action="store_true", help="释放回公共池")
 
     logp = sub.add_parser("log", help="记一条进展")
     logp.add_argument("--id", required=True, dest="tid")
@@ -63,7 +64,12 @@ def build_parser() -> argparse.ArgumentParser:
     listp = sub.add_parser("list", help="查在办任务")
     listp.add_argument("--pool", action="store_true")
     listp.add_argument("--mine", action="store_true")
-    listp.add_argument("--owner")
+    listp.add_argument(
+        "--owner", help="某个人的 uuid（精确匹配；名字请用 --owner-name）"
+    )
+    listp.add_argument(
+        "--owner-name", dest="owner_name", help="按显示名模糊筛（子串、不分大小写）"
+    )
     listp.add_argument("--status")
     listp.add_argument("--category")
     listp.add_argument("--tag")
@@ -76,7 +82,12 @@ def build_parser() -> argparse.ArgumentParser:
     showp.add_argument("--json", action="store_true")
 
     hist = sub.add_parser("history", help="查已结案")
-    hist.add_argument("--owner")
+    hist.add_argument(
+        "--owner", help="某个人的 uuid（精确匹配；名字请用 --owner-name）"
+    )
+    hist.add_argument(
+        "--owner-name", dest="owner_name", help="按显示名模糊筛（子串、不分大小写）"
+    )
     hist.add_argument("--mine", action="store_true")
     hist.add_argument("--category")
     hist.add_argument("--tag")
@@ -93,6 +104,11 @@ def build_parser() -> argparse.ArgumentParser:
     valp.add_argument("--deep", action="store_true")
     valp.add_argument("--json", action="store_true")
 
+    initp = sub.add_parser("init", help="初始化本机身份（一台机器只一次）")
+    initp.add_argument("--claim", help="认领名册里已有的 uuid")
+    initp.add_argument("--new", action="store_true", dest="new_id", help="新建身份")
+    initp.add_argument("--name", help="新建身份时的显示名字（必填）")
+
     # 宿主（插件 / SKILL.md）的调用写法是 `progress.py list --repo <仓库>`：
     # `--repo` 挂在**子命令后面**，所以每个子命令都要认；子命令给的值覆盖顶层那个。
     for parser_ in sub.choices.values():
@@ -119,6 +135,7 @@ def to_query(args: argparse.Namespace) -> None:
         args.q = ListQuery(
             scope=scope,
             owner=getattr(args, "owner", None),
+            owner_name=getattr(args, "owner_name", None),
             statuses=tuple(
                 s.strip()
                 for s in (getattr(args, "status", "") or "").split(",")
@@ -134,6 +151,7 @@ def to_query(args: argparse.Namespace) -> None:
     elif command == "history":
         args.q = HistoryQuery(
             owner=getattr(args, "owner", None),
+            owner_name=getattr(args, "owner_name", None),
             mine=bool(getattr(args, "mine", False)),
             category=getattr(args, "category", None),
             tag=getattr(args, "tag", None),
@@ -206,6 +224,8 @@ def main(argv: list[str] | None = None) -> int:
     to_query(args)
 
     command = command_of(args)
+    if command == "init":
+        return _run_init(args)
     try:
         # 定位只做一次：解析好的工作区根挂回 args，runner 与整命令锁都拿它
         args.repo = str(resolve_repo(getattr(args, "repo", None)))
@@ -249,6 +269,43 @@ def _lock_dir(repo: Path) -> Path:
     return lock_dir
 
 
+def _run_init(args: argparse.Namespace) -> int:
+    """init 不进 runner、不解析台账、不碰 git：只写机器身份文件。"""
+    from ..actions.init_identity import init_identity
+
+    repo: Path | None = None
+    raw = getattr(args, "repo", None)
+    try:
+        repo = as_root(raw, source="--repo") if raw else root_of(Path.cwd().resolve())
+    except Fail:
+        repo = None
+    try:
+        res = init_identity(
+            repo,
+            claim=getattr(args, "claim", None),
+            new=bool(getattr(args, "new_id", False)),
+            name=getattr(args, "name", "") or "",
+        )
+    except Fail as exc:
+        render.fail_message(exc)
+        return BUSINESS
+    if res.get("need_choose"):
+        print("这台机器还没初始化。当前仓库里已有的用户：")
+        for opt in res.get("options", []):
+            print(f"  {opt['uuid']}  {opt['name']}")
+        print("请重跑：init --claim=<uuid>  认领，或  init --new --name=<名字>  新建")
+        return 0
+    if res.get("already"):
+        print(
+            f"已经初始化过，未做改动：{res['name'] or res['uuid'][:8]}（{res['uuid']}）"
+        )
+        print(f"文件：{res['path']}")
+        return 0
+    print(f"已初始化：{res['name'] or res['uuid'][:8]}（{res['uuid']}）")
+    print(f"文件：{res['path']}")
+    return 0
+
+
 def _readonly(command: str) -> bool:
     from ..actions.registry import spec_of
 

package/skill/scripts/ledgerkit/shell/gitops.py

@@ -30,7 +30,13 @@ GIT_TIMEOUT = 30
 
 
 def _git(*args: str, timeout: int | None = GIT_TIMEOUT) -> subprocess.CompletedProcess:
-    """跑一条 git。没装 git 不当崩溃：返回 127 的空结果，由调用方按返回码处理。"""
+    """跑一条 git。没装 git 不当崩溃：返回 127 的空结果，由调用方按返回码处理。
+
+    **超时也折成返回码 124**，不许抛出去：`sync_down` 的 fetch 分支、`push` 的重试、
+    `_rebase_retry` 全按返回码判「远端不通」，抛异常会被 runner 兜底成「未预期错误」
+    （退出码 3），把「拉取失败、按本地最新写」这条既定降级路径整条跳过。触发场景是
+    弱网 / 网络黑洞 / 代理挂住 —— 远端不立刻拒绝，fetch 一直挂到超时（2026-10-25 修）。
+    """
     try:
         return subprocess.run(
             list(args), capture_output=True, text=True, timeout=timeout, check=False
@@ -39,6 +45,13 @@ def _git(*args: str, timeout: int | None = GIT_TIMEOUT) -> subprocess.CompletedP
         return subprocess.CompletedProcess(
             list(args), 127, stdout="", stderr="git: command not found"
         )
+    except subprocess.TimeoutExpired:
+        return subprocess.CompletedProcess(
+            list(args),
+            124,
+            stdout="",
+            stderr=f"git: timed out after {timeout}s",
+        )
 
 
 @contextlib.contextmanager

package/skill/scripts/ledgerkit/shell/render.py

@@ -101,7 +101,8 @@ def show_view(res: ShowResult, *, as_json: bool) -> None:
     task = res.task
     _out(f"{task.get('tid', '')}：{task.get('title', '')}")
     _out(
-        f"  状态：{task.get('status', '')}　负责人：{task.get('owner') or '（未认领）'}"
+        f"  状态：{task.get('status', '')}　"
+        f"负责人：{task.get('owner_name') or task.get('owner') or '（未认领）'}"
     )
     _out(
         f"  创建：{fmt_local(task.get('created'))}　"
@@ -143,7 +144,7 @@ def history_view(res: HistoryResult, q: HistoryQuery | None, *, as_json: bool) -
     for row in res.records:
         _out(
             f"  {fmt_local(row.get('finished'))}  "
-            f"{row.get('owner') or '（无人）':<12} {row.get('title', '')}"
+            f"{row.get('owner_name') or row.get('owner') or '（无人）':<12} {row.get('title', '')}"
         )
 
 

package/skill/scripts/ledgerkit/shell/runner.py

@@ -213,7 +213,7 @@ def _task_snapshot(repo: Path, me) -> dict[str, Any]:
 
     tasks: dict[str, Any] = {}
     tasks.update(TaskStore(repo, POOL_REL).all())
-    tasks.update(TaskStore(repo, shard_rel(me.email)).all())
+    tasks.update(TaskStore(repo, shard_rel(me.uuid)).all())
     return tasks
 
 

package/skill/scripts/ledgerkit/store/history_store.py

@@ -9,9 +9,8 @@ from pathlib import Path
 from typing import Any
 
 from ..core import history_md
-from ..core.paths import HISTORY_DIR, LEGACY_HISTORY_REL, to_repo_rel
+from ..core.paths import HISTORY_DIR, to_repo_rel
 from .atomic import write_text_atomic
-from .worklog_store import WorklogStore
 
 HIT = "hit"
 MISS = "miss"
@@ -25,16 +24,12 @@ class HistoryStore:
     # ---- 读 ----
 
     def sources(self) -> list[Path]:
-        """按月的 `history/*.md`（按文件名排序）+ 存量平铺文件（只读，永不重写）。"""
+        """按月的 `history/*.md`（按文件名排序）。"""
         base = self.repo / to_repo_rel(HISTORY_DIR)
-        files = sorted(base.glob("*.md")) if base.is_dir() else []
-        legacy = self.repo / to_repo_rel(LEGACY_HISTORY_REL)
-        if legacy.is_file():
-            files.append(legacy)
-        return files
+        return sorted(base.glob("*.md")) if base.is_dir() else []
 
     def month_key(self, path: Path) -> str:
-        """按月文件的 `YYYYMM`；存量平铺文件没有月份键，返回空串。"""
+        """按月文件的 `YYYYMM`。"""
         stem = Path(path).stem
         return stem if len(stem) == 6 and stem.isdigit() else ""
 
@@ -46,16 +41,6 @@ class HistoryStore:
         except OSError as exc:
             raise ValueError(f"读 {path} 失败：{exc}") from exc
 
-    def _read_worklog(self, path: Path):
-        """升级要回链的 worklog 头部：读文件这件事留在 store，core 只消费返回的字典。"""
-        logs = WorklogStore(self.repo)
-
-        def read(log_name: str) -> dict[str, Any] | None:
-            found = logs.by_name(log_name)
-            return logs.head_meta(found) if found else None
-
-        return read
-
     # ---- 判重 ----
 
     def has_log(
@@ -79,6 +64,11 @@ class HistoryStore:
                 if Path(worklog).name == Path(log_name).name:
                     return HIT
                 continue
+            if log_name is None and worklog:
+                # 历史行里有链接，但这次判不出对应的是哪篇文档（任务的过程文档丢了 / 被移走）：
+                # 判不了就明说。拿 miss 冒充会再追加一行 ⇒ 同一条任务两条结案记录。
+                undecidable = True
+                continue
             if not worklog:
                 if created and title:
                     if row.get("created") == created and row.get("title") == title:
@@ -90,11 +80,7 @@ class HistoryStore:
     # ---- 算 ----
 
     def append_row(self, path: Path, row: dict[str, Any]) -> dict[str, Any]:
-        """算出「追加这一行后的新全文」，**不落盘**。
-
-        返回四个键：`text` / `upgraded` / `duplicate` / `fallback_cols`（`None` = 正常 9 列）。
-        老表列少又不敢整体升级时，按现有列数追加并让业务层提示，绝不硬写 9 列把表格挤歪。
-        """
+        """算出「追加这一行后的新全文」，**不落盘**。返回 `text` / `duplicate`。"""
         original = self.read(path)
         duplicate = (
             self.has_log(
@@ -105,67 +91,26 @@ class HistoryStore:
             )
             == HIT
         )
-        if not original.strip():
-            text = _fresh_table()
-            upgraded = False
-            fallback_cols = None
-        else:
-            cols = history_md.history_cols(original)
-            if cols == 9:
-                text = original
-                upgraded = False
-                fallback_cols = None
-            else:
-                upgraded_text = history_md.upgrade_history(
-                    original,
-                    read_worklog=self._read_worklog(path),
-                    fallback_created=row.get("created") or "",
-                )
-                if upgraded_text is None:
-                    text = original
-                    upgraded = False
-                    fallback_cols = cols
-                else:
-                    text, _ = upgraded_text
-                    upgraded = True
-                    fallback_cols = None
-        line = (
-            history_md.history_line(
-                row.get("finished") or "",
-                row.get("created"),
-                row.get("title") or "",
-                row.get("owner"),
-                row.get("summary") or "",
-                row.get("worklog"),
-                row.get("category"),
-                row.get("tags"),
-                row.get("creator"),
-            )
-            if fallback_cols is None
-            else history_md.history_line_for_cols(
-                fallback_cols,
-                row.get("finished") or "",
-                row.get("created"),
-                row.get("title") or "",
-                row.get("owner"),
-                row.get("summary") or "",
-                row.get("worklog"),
-                row.get("category"),
-                row.get("tags"),
-                row.get("creator"),
-            )
+        text = original if original.strip() else _fresh_table()
+        line = history_md.history_line(
+            row.get("finished") or "",
+            row.get("created"),
+            row.get("title") or "",
+            row.get("owner"),
+            row.get("summary") or "",
+            row.get("worklog"),
+            category=row.get("category"),
+            tags=row.get("tags"),
+            creator=row.get("creator"),
+            owner_name=row.get("owner_name"),
+            creator_name=row.get("creator_name"),
         )
-        return {
-            "text": _append_line(text, line),
-            "upgraded": upgraded,
-            "duplicate": duplicate,
-            "fallback_cols": fallback_cols,
-        }
+        return {"text": _append_line(text, line), "duplicate": duplicate}
 
     # ---- 写 ----
 
     def write(self, path: Path, text: str) -> None:
-        """历史表唯一的写回口：只用于「结案追加」与「8→9 列升级」的结果落盘。"""
+        """历史表唯一的写回口：只用于「结案追加」的结果落盘。"""
         write_text_atomic(path, text)
 
 
@@ -174,7 +119,7 @@ def _name_of(worklog: str | None) -> str | None:
 
 
 def _fresh_table() -> str:
-    """当月第一次结案：按九列表头起表（表头的真源只有 `history_md` 一处）。"""
+    """当月第一次结案：按十一列表头起表（表头的真源只有 `history_md` 一处）。"""
     return (
         f"{history_md.HISTORY_TITLE}\n\n"
         f"{history_md.HISTORY_HEADER}\n{history_md.HISTORY_SEP}\n"

package/skill/scripts/ledgerkit/store/owners_index.py

@@ -32,7 +32,7 @@ class OwnersIndex:
 
     def ensure(self, me: Identity) -> tuple[bool, dict[str, Any]]:
         """登记 / 补 `joined`。`name` 只在首次登记时写入，之后不回写（名字是给你做对照的被动字段，不该被任何逻辑读）。返回 (这次写了没有, 记录)。"""
-        key = normalize(me.email)
+        key = normalize(me.uuid)
         with self._open() as session:
             data = session.data
             workers = data.setdefault("workers", {})
@@ -48,6 +48,21 @@ class OwnersIndex:
                 return True, dict(record)
             return False, dict(record)
 
+    def keys_of_name(self, fragment: str) -> set[str]:
+        """显示名模糊匹配（不分大小写的子串）⇒ uuid 集合。**只给查询筛选**，不参与归属判定。
+
+        比对的是名册里的名字（`workers[<uuid>].name`），不是每条任务上那份冗余的
+        `owner_name`：改名后名册先变，筛选结果跟着变，任务里的旧名字不会干扰。
+        """
+        needle = normalize(fragment)
+        if not needle:
+            return set()
+        return {
+            key
+            for key, record in self.all().items()
+            if needle in normalize(str((record or {}).get("name") or ""))
+        }
+
     def shards(self) -> dict[str, Path]:
         """身份 → 分片绝对路径（只信索引）。"""
         out: dict[str, Path] = {}
@@ -110,5 +125,3 @@ class _IndexSession:
     def __exit__(self, *exc) -> None:
         if self.changed:
             self.store._flush(self.data)  # 同一个包内的受控写回口
-
-

package/skill/scripts/ledgerkit/store/task_store.py

@@ -22,7 +22,7 @@ class TaskStore(JSONStore):
         self.identity = identity
 
     def _flush(self, data: dict[str, Any]) -> None:
-        """写盘时带上分片顶部的 `identity`（只存邮箱；显示名在索引里）。"""
+        """写盘时带上分片顶部的 `identity`（只存 uuid；显示名在索引里）。"""
         if self.identity is not None:
-            data["identity"] = {"email": self.identity.email}
+            data["identity"] = {"uuid": self.identity.uuid}
         super()._flush(data)