ai-worklog 1.0.1 → 1.0.3

package/bin/index.js

@@ -132,8 +132,9 @@ async function setupGitlabConfig() {
     } catch {}
   }
 
-  // 尝试从 glab 配置自动读取
   let token = '', username = '';
+
+  // 来源1：glab 配置文件
   const glabPaths = [
     path.join(os.homedir(), 'Library', 'Application Support', 'glab-cli', 'config.yml'),
     path.join(os.homedir(), '.config', 'glab-cli', 'config.yml'),
@@ -150,11 +151,51 @@ async function setupGitlabConfig() {
     if (token) { console.log('  ✓ 从 glab 配置自动读取了 Token'); break; }
   }
 
-  // 未找到则手动输入
+  // 来源2：git credential helper（适合配置了 HTTPS 凭据的用户）
   if (!token) {
-    console.log(`\n  需要 GitLab Personal Access Token（api + write_repository 权限）`);
-    console.log(`  获取地址: https://${GITLAB_HOST}/-/user_settings/personal_access_tokens\n`);
-    token = await prompt('  GitLab Token: ');
+    try {
+      const cr = spawnSync('git', ['credential', 'fill'], {
+        input: `protocol=https\nhost=${GITLAB_HOST}\n\n`,
+        encoding: 'utf8', timeout: 3000,
+      });
+      const passMatch = cr.stdout.match(/password=(.+)/);
+      const userMatch = cr.stdout.match(/username=(.+)/);
+      if (passMatch) { token = passMatch[1].trim(); console.log('  ✓ 从 git credential 自动读取了 Token'); }
+      if (userMatch && !username) username = userMatch[1].trim();
+    } catch {}
+  }
+
+  // 来源3：环境变量
+  if (!token && process.env.GITLAB_TOKEN) {
+    token = process.env.GITLAB_TOKEN;
+    console.log('  ✓ 从环境变量 GITLAB_TOKEN 读取了 Token');
+  }
+
+  // 都没找到：自动打开浏览器到预填好的 Token 创建页，提示粘贴
+  if (!token) {
+    const tokenUrl = `https://${GITLAB_HOST}/-/user_settings/personal_access_tokens?name=ai-worklog&scopes=api,write_repository`;
+    console.log('\n  未检测到 GitLab Token，正在打开浏览器...');
+    console.log(`  请在页面中点击「Create personal access token」，复制后粘贴到下方\n`);
+    spawnSync('open', [tokenUrl]);                    // macOS
+    spawnSync('xdg-open', [tokenUrl]);                // Linux（忽略失败）
+    token = await prompt('  粘贴 Token: ');
+  }
+
+  // 用户名：通过 API 自动获取，避免手动输入
+  if (!username && token) {
+    try {
+      const res = await apiRequest({
+        hostname: GITLAB_HOST,
+        path: '/api/v4/user',
+        method: 'GET',
+        headers: { 'PRIVATE-TOKEN': token },
+        rejectUnauthorized: false,
+      });
+      if (res.body && res.body.username) {
+        username = res.body.username;
+        console.log(`  ✓ 自动获取用户名: ${username}`);
+      }
+    } catch {}
   }
   if (!username) {
     username = await prompt('  GitLab 用户名: ');

package/package.json

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

package/scripts/collect_work_log.py

@@ -278,21 +278,31 @@ def generate_summary(
     if total_sessions == 0:
         return _generate_empty_log(target_date)
 
-    # 构建给 AI 的原始数据
+    # 构建给 AI 的原始数据（去重 + 截断，控制 token 消耗）
+    def dedup_and_trim(msgs: list[str], max_chars: int = 200) -> list[str]:
+        seen: set[str] = set()
+        result = []
+        for m in msgs:
+            key = m[:80]  # 用前 80 字符去重
+            if key in seen:
+                continue
+            seen.add(key)
+            result.append(m if len(m) <= max_chars else m[:max_chars] + "…")
+        return result
+
     project_sections = []
     for proj_name, data in all_projects.items():
         msgs_parts = []
         if data["claude"]:
-            msgs_parts.append(f"[Claude Code 对话 {len(data['claude'])} 条]")
-            for i, m in enumerate(data["claude"], 1):
-                # 截断过长消息
-                msg = m if len(m) <= 500 else m[:500] + "..."
-                msgs_parts.append(f"  {i}. {msg}")
+            trimmed = dedup_and_trim(data["claude"])
+            msgs_parts.append(f"[Claude Code {len(data['claude'])} 条，去重后 {len(trimmed)} 条]")
+            for i, m in enumerate(trimmed, 1):
+                msgs_parts.append(f"  {i}. {m}")
         if data["codex"]:
-            msgs_parts.append(f"[Codex 对话 {len(data['codex'])} 条]")
-            for i, m in enumerate(data["codex"], 1):
-                msg = m if len(m) <= 500 else m[:500] + "..."
-                msgs_parts.append(f"  {i}. {msg}")
+            trimmed = dedup_and_trim(data["codex"])
+            msgs_parts.append(f"[Codex {len(data['codex'])} 条，去重后 {len(trimmed)} 条]")
+            for i, m in enumerate(trimmed, 1):
+                msgs_parts.append(f"  {i}. {m}")
         project_sections.append(f"项目: {proj_name}\n" + "\n".join(msgs_parts))
 
     raw_data = "\n\n".join(project_sections)
@@ -462,7 +472,9 @@ def git_commit_and_push(log_file: Path, target_date: str, push: bool = True) ->
     """全自动 git init → GitLab 项目创建 → commit → push"""
 
     def run(cmd: list[str], check_err: bool = True) -> subprocess.CompletedProcess:
-        r = subprocess.run(cmd, cwd=REPO_DIR, capture_output=True, text=True)
+        env = os.environ.copy()
+        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)
         return r
@@ -496,7 +508,7 @@ def git_commit_and_push(log_file: Path, target_date: str, push: bool = True) ->
         run(["git", "add", "-A"])
         run(["git", "commit", "-m", "init: 初始化工作日志仓库"])
 
-    # ── 4. 提交日志 ────────────────────────────────────────────────────────────
+    # ── 4. 提交日志 ───────────────────────────────────────────────────────────
     rel_path = log_file.relative_to(REPO_DIR)
     print(f"Git: 添加 {rel_path}")
     if run(["git", "add", str(rel_path)]).returncode != 0: