@jesonliu/lark-claudecode-bridge 0.3.1 → 0.7.0

package/dist/util/diff.js

@@ -0,0 +1,70 @@
+// 文件差异工具：为写工具（Write/Edit）的确认卡片生成 unified diff 文本。
+// 基于 jsdiff（零依赖），上下文行数 3（与 git diff 默认一致）。
+import { readFileSync } from 'node:fs';
+import { createTwoFilesPatch } from 'diff';
+/** 生成写工具的 unified diff；无内容差异或无法生成时返回 ''（调用方回退显示 summary） */
+export function generateFileDiff(toolName, input) {
+    try {
+        if (toolName === 'Write')
+            return writeDiff(input);
+        if (toolName === 'Edit')
+            return editDiff(input);
+        // NotebookEdit 的 input 是单元格级结构（new_cell 等），单元格 diff 可读性差，不生成
+        return '';
+    }
+    catch {
+        // 读文件失败（权限/编码等）不应阻断确认流程：无 diff 就显示原 summary
+        return '';
+    }
+}
+/** Write：新文件（原不存在）= 全 + 行；覆盖写 = 与原内容全文对比 */
+function writeDiff(input) {
+    const filePath = input.file_path;
+    if (typeof filePath !== 'string' || !filePath)
+        return '';
+    const newContent = typeof input.content === 'string' ? input.content : '';
+    const oldExists = exists(filePath);
+    const oldContent = oldExists ? readFile(filePath) : undefined;
+    return toPatch(filePath, oldContent, newContent, oldExists);
+}
+/** Edit：读原文件应用 old_string→new_string 替换后整体对比（比仅对比 old/new 片段多上下文，可读性更好） */
+function editDiff(input) {
+    const filePath = input.file_path;
+    if (typeof filePath !== 'string' || !filePath)
+        return '';
+    const { oldString, newString } = { oldString: input.old_string, newString: input.new_string };
+    if (typeof oldString !== 'string' || typeof newString !== 'string')
+        return '';
+    const raw = readFile(filePath);
+    const content = normalizeEol(raw);
+    // old_string 不在文件中（模型定位失误）：不生成误导性的空 diff，回退 summary
+    if (!content.includes(oldString))
+        return '';
+    const replaced = input.replace_all === true
+        ? content.split(oldString).join(newString)
+        : content.replace(oldString, () => newString); // 函数形式替换：避免 newString 含 $& 等替换模式被二次解释
+    return toPatch(filePath, content, replaced, true);
+}
+/** 统一输出：jsdiff 补丁文本，去掉 Index/=== 头部行；CRLF 归一为 LF 防整文件误报全改 */
+function toPatch(filePath, oldContent, newContent, oldExists) {
+    const patch = createTwoFilesPatch(oldExists ? filePath : '/dev/null', filePath, oldExists ? normalizeEol(oldContent ?? '') : '', // jsdiff v9 不接受 undefined：空串生成 -0,0 全新增
+    normalizeEol(newContent), undefined, undefined, { context: 3 });
+    // 去掉 jsdiff 加的头部噪音（'Index: ...' 与 '====' 分隔行），保留 ---/+++ 起始的正文
+    return patch.replace(/^(Index: [^\n]*\n)?(===+[^\n]*\n)?/, '');
+}
+function exists(p) {
+    try {
+        readFileSync(p);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function readFile(p) {
+    return readFileSync(p, 'utf8');
+}
+function normalizeEol(s) {
+    return s.replace(/\r\n/g, '\n');
+}
+//# sourceMappingURL=diff.js.map

package/dist/util/diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/util/diff.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,2CAA2C;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAE3C,4DAA4D;AAC5D,MAAM,UAAU,gBAAgB,CAAC,QAAgB,EAAE,KAA8B;IAC/E,IAAI,CAAC;QACH,IAAI,QAAQ,KAAK,OAAO;YAAE,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,QAAQ,KAAK,MAAM;YAAE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChD,6DAA6D;QAC7D,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,4CAA4C;QAC5C,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,4CAA4C;AAC5C,SAAS,SAAS,CAAC,KAA8B;IAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC;IACjC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAC;IACzD,MAAM,UAAU,GAAG,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9D,OAAO,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AAC9D,CAAC;AAED,2EAA2E;AAC3E,SAAS,QAAQ,CAAC,KAA8B;IAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC;IACjC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAC;IACzD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;IAC9F,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IAC9E,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAClC,oDAAoD;IACpD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,KAAK,IAAI;QACzC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC1C,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,sCAAsC;IACvF,OAAO,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,6DAA6D;AAC7D,SAAS,OAAO,CAAC,QAAgB,EAAE,UAA8B,EAAE,UAAkB,EAAE,SAAkB;IACvG,MAAM,KAAK,GAAG,mBAAmB,CAC/B,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,EAClC,QAAQ,EACR,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,wCAAwC;IACzF,YAAY,CAAC,UAAU,CAAC,EACxB,SAAS,EACT,SAAS,EACT,EAAE,OAAO,EAAE,CAAC,EAAE,CACf,CAAC;IACF,+DAA+D;IAC/D,OAAO,KAAK,CAAC,OAAO,CAAC,oCAAoC,EAAE,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,MAAM,CAAC,CAAS;IACvB,IAAI,CAAC;QACH,YAAY,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS;IACzB,OAAO,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,YAAY,CAAC,CAAS;IAC7B,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAClC,CAAC"}

package/dist/util/workspace-diff.d.ts

@@ -0,0 +1,9 @@
+export interface WorkspaceDiff {
+    diff: string;
+    files: number;
+}
+/**
+ * 收集工作区全部未提交改动（staged + unstaged + untracked）为 unified diff 文本与文件数。
+ * 返回 null = 非 git 仓库（调用方回退旧行为）；diff 空串 = git 仓库但无改动。
+ */
+export declare function collectWorkspaceDiff(wsPath: string): Promise<WorkspaceDiff | null>;

package/dist/util/workspace-diff.js

@@ -0,0 +1,56 @@
+// 工作区改动收集：code-dev 工作区任务收尾时用 git diff 生成全量 unified diff。
+// 不做文件快照——git 是 code-dev 工作区的既有事实（非 git 仓库回退旧上传行为，由调用方处理）
+import { execFile } from 'node:child_process';
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { promisify } from 'node:util';
+import { createTwoFilesPatch } from 'diff';
+const execFileP = promisify(execFile);
+// untracked 合成新增 diff 的文件数上限：防 node_modules 误入 status 时 diff 爆炸
+const MAX_UNTRACKED_FILES = 20;
+function isGitRepo(wsPath) {
+    return execFileP('git', ['rev-parse', '--is-inside-work-tree'], { cwd: wsPath })
+        .then((r) => r.stdout.trim() === 'true')
+        .catch(() => false);
+}
+function normalizeEol(s) {
+    return s.replace(/\r\n/g, '\n');
+}
+/** untracked 文件合成为「全新增」diff（git diff 不覆盖未跟踪文件） */
+async function untrackedDiff(wsPath) {
+    const status = await execFileP('git', ['status', '--porcelain'], { cwd: wsPath }).catch(() => ({ stdout: '' }));
+    const files = status.stdout
+        .split('\n')
+        .filter((l) => l.startsWith('??'))
+        .map((l) => l.slice(3).trim())
+        .filter((f) => f && !f.endsWith('/')) // 目录条目（?? dir/）无法按文件读取，跳过
+        .slice(0, MAX_UNTRACKED_FILES);
+    const patches = [];
+    for (const f of files) {
+        const content = await readFile(join(wsPath, f), 'utf8').then(normalizeEol).catch(() => null);
+        if (content === null)
+            continue;
+        patches.push(createTwoFilesPatch('/dev/null', f, '', content, undefined, undefined, { context: 3 })
+            .replace(/^(Index: [^\n]*\n)?(===+[^\n]*\n)?/, ''));
+    }
+    return patches.join('\n');
+}
+/**
+ * 收集工作区全部未提交改动（staged + unstaged + untracked）为 unified diff 文本与文件数。
+ * 返回 null = 非 git 仓库（调用方回退旧行为）；diff 空串 = git 仓库但无改动。
+ */
+export async function collectWorkspaceDiff(wsPath) {
+    if (!(await isGitRepo(wsPath)))
+        return null;
+    const tracked = await execFileP('git', ['diff', 'HEAD', '--unified=3'], { cwd: wsPath, maxBuffer: 16 * 1024 * 1024 })
+        .then((r) => r.stdout)
+        .catch(() => '');
+    const untracked = await untrackedDiff(wsPath);
+    const trackedFiles = (tracked.match(/^diff --git /gm) ?? []).length;
+    const untrackedFiles = (untracked.match(/^\+\+\+ /gm) ?? []).length;
+    return {
+        diff: [tracked.trimEnd(), untracked.trimEnd()].filter(Boolean).join('\n'),
+        files: trackedFiles + untrackedFiles,
+    };
+}
+//# sourceMappingURL=workspace-diff.js.map

package/dist/util/workspace-diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-diff.js","sourceRoot":"","sources":["../../src/util/workspace-diff.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.3.0";
+export declare const VERSION = "0.6.0";

package/dist/version.js

@@ -1,3 +1,3 @@
 // 版本号单一来源：package.json / lcb version / smoke 测试均以此为准
-export const VERSION = '0.3.0';
+export const VERSION = '0.6.0';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jesonliu/lark-claudecode-bridge",
-  "version": "0.3.1",
+  "version": "0.7.0",
   "description": "飞书 ↔ Claude Code 桥接器：卡片确认走长连接，免公网 IP",
   "main": "dist/index.js",
   "scripts": {
@@ -25,11 +25,13 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3.247",
     "@larksuiteoapi/node-sdk": "^1.73.0",
+    "diff": "^9.0.0",
     "picocolors": "^1.1.1",
     "yaml": "^2.9.0",
     "zod": "^4.4.0"
   },
   "devDependencies": {
+    "@types/diff": "^7.0.2",
     "@types/node": "^26.4.0",
     "tsx": "^4.23.12",
     "typescript": "^7.0.2",