dsh-task-ledger 0.0.96 → 0.0.98

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

@@ -18,6 +18,7 @@ from ..actions.result import (
     ShowResult,
     ValidationReport,
 )
+from ..core.identity import Identity
 from ..core.time import fmt_local
 
 
@@ -51,6 +52,23 @@ def _json(data: Any) -> None:
     sys.stdout.write(json.dumps(data, ensure_ascii=False, indent=2) + "\n")
 
 
+#: 任务 / 历史行里要转本机时区的时间字段（存盘一律 UTC，出门一律本机时区）。
+TIME_FIELDS = ("created", "started", "updated", "finished")
+
+
+def localize_times(data: dict) -> dict:
+    """复制一份，把上面四个时间字段转成本机时区；其余字段原样。
+
+    **只动这四个**：任务号里嵌的时间戳、过程文档正文里的时间都不动（原文照旧）。
+    """
+    out = dict(data)
+    for key in TIME_FIELDS:
+        value = out.get(key)
+        if value:
+            out[key] = fmt_local(value)
+    return out
+
+
 def result(res: Result, *, as_json: bool) -> None:
     """写动作：一律人话（`--json` 不挂写动作，传进来也按人话打）。"""
     del as_json
@@ -71,7 +89,7 @@ def result(res: Result, *, as_json: bool) -> None:
 
 def list_view(res: ListResult, q: ListQuery | None, *, as_json: bool) -> None:
     if as_json:
-        _json({tid: task for tid, task in res.rows.items()})
+        _json({tid: localize_times(task) for tid, task in res.rows.items()})
         return
     if not res.table:
         _out("没有符合条件的在办任务。")
@@ -84,11 +102,33 @@ def list_view(res: ListResult, q: ListQuery | None, *, as_json: bool) -> None:
         _err(line)
 
 
+def whoami_view(identity: Identity | None, *, as_json: bool) -> None:
+    """本机身份：未初始化给 `uuid` / `name` 双 null（不是错误，调用方据此引导 init）。"""
+    if as_json:
+        _json(
+            {
+                "uuid": identity.uuid if identity else None,
+                "name": identity.name if identity else None,
+            }
+        )
+        return
+    if identity is None:
+        _out("这台机器还没有初始化身份。")
+        _out(
+            "  处理：请用户在自己的终端运行 "
+            "`progress.py init --repo <工作区根>`，由 ta 亲自选择/新建并确认。"
+        )
+        return
+    _out(f"@{identity.label()}   {identity.uuid}")
+
+
 def show_view(res: ShowResult, *, as_json: bool) -> None:
     if as_json:
         _json(
             {
-                "task": res.task,
+                "task": localize_times(res.task),
+                # 文档自述还是回退查在办：调用方据此知道字段来源（老文档 / 文档缺失）
+                "legacy": res.legacy,
                 "worklog": {
                     "path": res.worklog.path if res.worklog else None,
                     "text": res.worklog.text if res.worklog else None,
@@ -125,11 +165,15 @@ def history_view(res: HistoryResult, q: HistoryQuery | None, *, as_json: bool) -
         _json({"count": res.count, "capped": res.capped})
         return
     if as_json:
+        filters = dict(res.filters)
+        for key in ("since", "until"):
+            if filters.get(key):
+                filters[key] = fmt_local(filters[key])
         _json(
             {
                 "count": res.count,
-                "filters": res.filters,
-                "records": list(res.records),
+                "filters": filters,
+                "records": [localize_times(row) for row in res.records],
                 "warnings": list(res.warnings),
                 "capped": res.capped,
             }

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

@@ -23,7 +23,8 @@ from .atomic import ensure_dir, write_text_atomic
 
 FALLBACK_TEMPLATE = """# <id>：<title>
 
-> **创建**：<created>（@<creator>）
+- **状态**：<status>
+- **创建**：<created> · @<creator>
 
 ## 背景
 
@@ -131,9 +132,10 @@ class WorklogStore:
         creator: str,
         category: str | None = None,
         tags: tuple[str, ...] = (),
+        status: worklog_md.StatusLine | None = None,
         first_exec: str | None = None,
     ) -> Path:
-        """一次写完整篇（含首条执行记录）。返回绝对路径。"""
+        """一次写完整篇（含状态行与首条执行记录）。返回绝对路径。"""
         rel = worklog_rel(tid, created)
         path = self.repo / to_repo_rel(rel)
         ensure_dir(path.parent)
@@ -144,6 +146,7 @@ class WorklogStore:
             creator=creator,
             category=category,
             tags=tags,
+            status=status,
             template=self.template(),
         )
         if first_exec:
@@ -155,14 +158,23 @@ class WorklogStore:
         """写回「锚点编辑后的新全文」；不许用它替换前五节正文。"""
         write_text_atomic(path, text)
 
-    def append_exec(self, path: Path, line: str) -> bool:
-        """追加一条执行记录；写不进返回 False，**不抛**（调用方自己决定报不报）。"""
+    def append_exec(
+        self, path: Path, line: str, *, status: worklog_md.StatusLine | None = None
+    ) -> bool:
+        """追加一条执行记录，并在**同一次写盘**里顺带刷新头部状态行（`status` 给了才刷）。
+
+        写不进返回 False，**不抛**（调用方自己决定报不报）。状态行与执行记录必须一起落地：
+        分两写就会留下「记录写了、状态没刷」这种不报错的不一致。
+        """
         try:
             text = path.read_text(encoding="utf-8-sig")
         except (OSError, UnicodeDecodeError):
             return False
         try:
-            write_text_atomic(path, worklog_md.append_exec_log(text, line))
+            new = worklog_md.append_exec_log(text, line)
+            if status is not None:
+                new = worklog_md.rewrite_status_line(new, status)
+            write_text_atomic(path, new)
         except Exception:  # noqa: BLE001 —— 写不进是这条记录的失败，不该掀翻整条命令
             return False
         return True