task-ledger 1.2.8 → 1.2.9

package/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: task-ledger
 description: 本地任务台账，跨会话记录在办任务的归属、进度与起止。当用户要登记一件新的事（新建任务 / 建个坑 / 这活我领了）、记录已有任务的进展（接着做 / 记一条进展 / 这轮先记下）、查看任务状态或历史（现在该做什么 / 这活谁在做 / 上周做过什么）时加载；对某个具体任务要求结案或退回时，只认用户的明确指令；只是改代码、讨论方案时不要用。
-version: 1.2.8
+version: 1.2.9
 allowed-tools: Read,Write,Bash,Grep
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "task-ledger",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "Task-ledger skill for coding agents: per-workspace progress tracking (ledger/progress.json, history, worklog) driven by a CLI script. Standalone install for CodeBuddy and other agents; also bundled inside the dsh-task-ledger DSH plugin.",
   "keywords": [
     "skill",

package/scripts/progress.py

@@ -982,6 +982,28 @@ def git_presync(action: str, args: argparse.Namespace) -> None:
                 file=sys.stderr,
             )
 
+    # 离线攒下的台账提交：联网后第一笔写先把它们推上去，别拿「有 N 个没推」挡住写入。
+    # 用户自己的业务提交不碰：push 会把它们一并带走，那个决定归用户（见 _rebase_retry）。
+    if ahead_n > 0:
+        g_tuple = ("git", "-C", str(git_root))
+        foreign_n, _ = _foreign_commits(g_tuple, upstream)
+        if foreign_n == 0:
+            pushed = _git(*g_tuple, "push", timeout=30)
+            if pushed.returncode != 0 and _rebase_retry(g_tuple):
+                pushed = _git(*g_tuple, "push", timeout=30)
+            if pushed.returncode == 0:
+                print(
+                    f"提示：写前把本地 {ahead_n} 个未推送的提交推上去了。",
+                    file=sys.stderr,
+                )
+                ahead_n = 0
+            else:
+                print(
+                    "提示：写前推送失败"
+                    f"（{_why(pushed.stderr or pushed.stdout, f'退出码 {pushed.returncode}')}）。",
+                    file=sys.stderr,
+                )
+
     root = str(git_root)
     progress_rel = f"{ledger_rel}/{PROGRESS_REL.name}"
     worklog_rel = f"{ledger_rel}/{WORKLOG_DIR.name}"