ai-worklog 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-worklog",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "AI 对话工作日志自动收集工具 —— 从 Claude Code / Codex 对话记录生成每日工作日志并推送到 GitLab",
   "bin": {
     "ai-worklog": "./bin/index.js"

package/scripts/collect_work_log.py

@@ -19,6 +19,80 @@ from pathlib import Path
 from typing import Optional
 
 
+# ─── TUI 输出 ────────────────────────────────────────────────────────────────
+
+_COLOR = sys.stdout.isatty()
+
+def _c(text: str, code: str) -> str:
+    return f"\033[{code}m{text}\033[0m" if _COLOR else text
+
+def bold(t):   return _c(t, "1")
+def dim(t):    return _c(t, "2")
+def green(t):  return _c(t, "32")
+def cyan(t):   return _c(t, "36")
+def yellow(t): return _c(t, "33")
+def gray(t):   return _c(t, "90")
+def red(t):    return _c(t, "31")
+def blue(t):   return _c(t, "34")
+
+
+def print_header(date_str: str, incremental: bool = False, prev_time: str = "") -> None:
+    line = f"  ai-worklog · {date_str}  "
+    w = max(len(line), 44)
+    print(f"\n╭{'─' * w}╮")
+    print(f"│{bold(line):<{w + (10 if _COLOR else 0)}}│")
+    print(f"╰{'─' * w}╯")
+    if incremental:
+        print(f"\n  {yellow('↻')} 增量更新模式  {dim(f'上次生成于 {prev_time}')}")
+
+
+def print_step(msg: str) -> None:
+    print(f"\n{bold(cyan('●'))} {bold(msg)}")
+
+
+def print_ok(msg: str) -> None:
+    print(f"  {green('✓')} {msg}")
+
+
+def print_info(msg: str) -> None:
+    print(f"  {dim('│')} {dim(msg)}")
+
+
+def print_warn(msg: str) -> None:
+    print(f"  {yellow('⚠')} {msg}", file=sys.stderr)
+
+
+def print_fail(msg: str) -> None:
+    print(f"  {red('✗')} {msg}", file=sys.stderr)
+
+
+def print_project_tree(data: dict, is_sessions: bool = True) -> None:
+    """打印项目列表（树形）"""
+    if not data:
+        print(f"  {gray('└─')} {gray('(无记录)')}")
+        return
+    items = list(data.items())
+    max_len = max(len(p) for p in data)
+    for i, (proj, val) in enumerate(items):
+        connector = gray("└─") if i == len(items) - 1 else gray("├─")
+        if is_sessions:
+            n_sessions = len(val)
+            n_turns = sum(len(t) for t in val)
+            stats = gray(f"{n_sessions} 对话  {n_turns} 轮")
+        else:
+            stats = gray(f"{len(val)} 条")
+        print(f"  {connector} {bold(proj.ljust(max_len))}  {stats}")
+
+
+def print_footer(log_file: Path, total_projects: int, total_turns: int) -> None:
+    w = 46
+    print(f"\n{'─' * w}")
+    rel = str(log_file).replace(str(Path.home()), "~")
+    print(f"  {green('✓')} {bold('完成')}  {total_projects} 个项目 · {total_turns} 轮对话")
+    print(f"  {dim(rel)}")
+    print(f"{'─' * w}\n")
+
+
 # ─── 配置 ───────────────────────────────────────────────────────────────────
 
 WORKLOG_CONFIG_FILE = Path.home() / ".config" / "worklog.json"
@@ -467,7 +541,6 @@ def save_log(target_date: str, content: str) -> Path:
     log_dir.mkdir(parents=True, exist_ok=True)
     log_file = log_dir / f"{target_date}.md"
     log_file.write_text(content, encoding="utf-8")
-    print(f"日志已保存: {log_file}")
     return log_file
 
 
@@ -636,67 +709,67 @@ def git_commit_and_push(log_file: Path, target_date: str, push: bool = True) ->
         env["LC_ALL"] = "C"  # 强制英文输出，保证字符串匹配不受本地化影响
         r = subprocess.run(cmd, cwd=REPO_DIR, capture_output=True, text=True, env=env)
         if check_err and r.returncode != 0:
-            print(f"命令失败: {' '.join(cmd)}\n{r.stderr.strip()}", file=sys.stderr)
+            print_fail(f"{' '.join(cmd[:2])}: {r.stderr.strip()}")
         return r
 
+    print_step("同步 Git")
+
     # ── 1. 初始化 git 仓库 ──────────────────────────────────────────────────
     is_git = run(["git", "rev-parse", "--git-dir"], check_err=False).returncode == 0
     if not is_git:
-        print("Git: 初始化仓库...")
+        print_info("初始化仓库...")
         if run(["git", "init"]).returncode != 0:
             return
         run(["git", "checkout", "-b", "main"], check_err=False)
+        print_ok("git init")
 
     # ── 2. 检查并创建 GitLab 远程（无需 glab）────────────────────────────────
     has_remote = run(["git", "remote", "get-url", "origin"], check_err=False).returncode == 0
     if not has_remote:
         repo_name = REPO_DIR.name
-        print(f"GitLab: 创建公开项目 {repo_name} ...")
+        print_info(f"在 GitLab 创建公开项目 {repo_name} ...")
         try:
             cfg = load_gitlab_config()
             ssh_url = gitlab_create_project(cfg, repo_name)
             run(["git", "remote", "add", "origin", ssh_url])
-            print(f"GitLab: 项目已创建 → {ssh_url}")
+            print_ok(f"远程仓库 → {ssh_url}")
         except Exception as e:
-            print(f"GitLab 创建失败: {e}", file=sys.stderr)
-            print("请手动设置 remote: git remote add origin <url>", file=sys.stderr)
+            print_fail(f"GitLab 创建失败: {e}")
+            print_info("请手动: git remote add origin <url>")
             return
 
     # ── 3. 确保有初始提交 ─────────────────────────────────────────────────────
     if run(["git", "rev-parse", "HEAD"], check_err=False).returncode != 0:
-        print("Git: 创建初始提交...")
         run(["git", "add", "-A"])
         run(["git", "commit", "-m", "init: 初始化工作日志仓库"])
 
     # ── 4. 提交日志 ───────────────────────────────────────────────────────────
     rel_path = log_file.relative_to(REPO_DIR)
-    print(f"Git: 添加 {rel_path}")
     if run(["git", "add", str(rel_path)]).returncode != 0:
         return
 
     commit_msg = f"docs: 工作日志 {target_date}"
-    print(f"Git: 提交 '{commit_msg}'")
     r = run(["git", "commit", "-m", commit_msg], check_err=False)
     if r.returncode != 0:
         if "nothing to commit" in r.stdout + r.stderr:
-            print("Git: 无变更，跳过提交（已在初始提交中）")
+            print_info("无新变更，跳过提交")
         else:
-            print(f"Git commit 失败: {r.stderr.strip()}", file=sys.stderr)
+            print_fail(f"commit 失败: {r.stderr.strip()}")
             return
-        # nothing to commit 不代表不需要 push，继续走推送流程
+    else:
+        print_ok(f"commit: {dim(commit_msg)}")
 
     # ── 5. 推送 ────────────────────────────────────────────────────────────────
     if push:
-        print("Git: 推送到远程...")
         r = run(["git", "push", "--set-upstream", "origin", "main"], check_err=False)
         if r.returncode != 0:
             r = run(["git", "push"])
         if r.returncode == 0:
-            print("Git: 推送成功 ✓")
+            print_ok("push → origin/main")
         else:
-            print(f"Git push 失败: {r.stderr.strip()}", file=sys.stderr)
+            print_fail(f"push 失败: {r.stderr.strip()}")
     else:
-        print("Git: 已跳过 push（--no-push 模式）")
+        print_info("已跳过 push（--no-push）")
 
 
 # ─── 主入口 ───────────────────────────────────────────────────────────────────
@@ -741,68 +814,61 @@ def main():
     args = parser.parse_args()
 
     target_date = parse_date_arg(args.date)
-    print(f"=== 收集 {target_date} 的工作日志 ===")
 
-    # 1. 检查是否存在 checkpoint（判断是否为增量更新）
+    # 1. 检查 checkpoint
     checkpoint = load_checkpoint(target_date)
     is_incremental = checkpoint is not None
     prev_file_counts = checkpoint["file_counts"] if is_incremental else {}
+    prev_time = checkpoint["generated_at"].split("T")[-1] if is_incremental else ""
 
-    if is_incremental:
-        print(f"检测到已有日志（生成于 {checkpoint['generated_at']}），进入增量更新模式")
+    print_header(target_date, is_incremental, prev_time)
 
-    # 2. 收集数据（增量模式只返回新增轮次）
-    print("收集 Claude Code 对话记录...")
-    claude_data, file_counts = collect_claude_sessions(target_date, prev_file_counts if is_incremental else None)
+    # 2. 收集 Claude Code 对话
+    print_step("收集 Claude Code 对话记录")
+    claude_data, file_counts = collect_claude_sessions(
+        target_date, prev_file_counts if is_incremental else None
+    )
+    print_project_tree(claude_data, is_sessions=True)
     total_claude_turns = sum(sum(len(t) for t in s) for s in claude_data.values())
-    total_claude_sessions = sum(len(s) for s in claude_data.values())
-    label = "新增" if is_incremental else "找到"
-    print(f"  {label} {len(claude_data)} 个项目，{total_claude_sessions} 个对话，{total_claude_turns} 轮交互")
 
-    print("收集 Codex 对话记录...")
+    # 3. 收集 Codex 对话
+    print_step("收集 Codex 对话记录")
     codex_data = collect_codex_sessions(target_date)
+    print_project_tree(codex_data, is_sessions=False)
     total_codex = sum(len(v) for v in codex_data.values())
-    print(f"  {label} {len(codex_data)} 个项目，{total_codex} 条消息")
+
+    total_projects = len(set(list(claude_data.keys()) + list(codex_data.keys())))
+    total_turns = total_claude_turns + total_codex
 
     if args.dry_run:
-        print(f"\n[dry-run] {'新增' if is_incremental else ''}数据预览：")
-        for proj, sessions in claude_data.items():
-            total_turns = sum(len(t) for t in sessions)
-            print(f"  [Claude/{proj}] {len(sessions)} 个对话，{total_turns} 轮")
-            for si, turns in enumerate(sessions[:2], 1):
-                print(f"    对话{si}: {len(turns)} 轮")
-                for user_msg, asst_msg in turns[:2]:
-                    print(f"      [用户] {user_msg[:60]}")
-                    if asst_msg:
-                        print(f"      [Claude] {asst_msg[:60]}")
-        for proj, msgs in codex_data.items():
-            print(f"  [Codex/{proj}] {len(msgs)} 条")
-            for m in msgs[:2]:
-                print(f"    - {m[:60]}")
+        print(f"\n{dim('[dry-run] 预览完毕，未调用 API')}\n")
         return
 
-    # 3. 生成日志内容
+    # 4. 生成日志
     if is_incremental:
         if total_claude_turns == 0 and total_codex == 0:
-            print("没有新增内容，无需更新")
+            print(f"\n  {yellow('─')} 没有新增内容，无需更新\n")
             return
-        print("调用 Claude API 更新日志（增量）...")
+        print_step(f"调用 {bold(MODEL)} 更新日志（增量）")
         log_file_path = LOGS_DIR / target_date[:4] / f"{target_date}.md"
         existing_log = log_file_path.read_text(encoding="utf-8") if log_file_path.exists() else ""
         content = generate_incremental_update(target_date, existing_log, claude_data, codex_data)
     else:
-        print("调用 Claude API 生成摘要...")
+        print_step(f"调用 {bold(MODEL)} 生成摘要")
         content = generate_summary(target_date, claude_data, codex_data)
 
-    # 4. 保存文件 + checkpoint
+    # 5. 保存文件 + checkpoint
+    print_step("保存日志")
     log_file = save_log(target_date, content)
     save_checkpoint(target_date, file_counts)
+    rel = str(log_file).replace(str(Path.home()), "~")
+    print_ok(rel)
 
-    # 5. Git 操作
+    # 6. Git 操作
     if not args.no_git:
         git_commit_and_push(log_file, target_date, push=not args.no_push)
 
-    print(f"\n完成！日志文件: {log_file}")
+    print_footer(log_file, total_projects, total_turns)
 
 
 if __name__ == "__main__":