wangchuan 2.16.0 → 2.17.1

package/dist/src/utils/prompt.js

@@ -1,37 +1,130 @@
 /**
- * prompt.ts — Interactive user confirmation
+ * prompt.ts — Interactive user confirmation with enhanced conflict resolution
  *
- * Provides single-file conflict prompt and batch conflict strategy,
- * supports TTY interactive and CI non-interactive mode (WANGCHUAN_NONINTERACTIVE=1).
+ * Provides single-file conflict prompt with:
+ *   - Compact 3-line diff preview (red deletions, green additions)
+ *   - File size comparison
+ *   - [d] show full diff
+ *   - [m] attempt three-way merge
+ *   - Standard [o] overwrite / [s] skip / [A] overwrite all / [S] skip all
+ *
+ * Supports TTY interactive and CI non-interactive mode (WANGCHUAN_NONINTERACTIVE=1).
  */
 import readline from 'readline';
+import chalk from 'chalk';
 import { t } from '../i18n.js';
+import { diffText } from './linediff.js';
 /** Default strategy for non-interactive mode (CI) */
 const NON_INTERACTIVE_DEFAULT = 'skip';
+/** Format file size in human-readable form */
+function formatSize(bytes) {
+    if (bytes < 1024)
+        return `${bytes}B`;
+    if (bytes < 1024 * 1024)
+        return `${(bytes / 1024).toFixed(1)}KB`;
+    return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+}
+/** Build a compact diff preview (first N changed lines from each side) */
+function buildDiffPreview(localContent, remoteContent, maxLines = 3) {
+    const lines = diffText(localContent, remoteContent, 1);
+    if (lines.length === 0)
+        return '';
+    const output = [];
+    let shown = 0;
+    for (const line of lines) {
+        if (shown >= maxLines)
+            break;
+        if (line.type === 'removed') {
+            output.push(`      ${chalk.red(`- ${line.content}`)}`);
+            shown++;
+        }
+        else if (line.type === 'added') {
+            output.push(`      ${chalk.green(`+ ${line.content}`)}`);
+            shown++;
+        }
+    }
+    const totalChanges = lines.filter(l => l.type !== 'context').length;
+    if (totalChanges > maxLines) {
+        output.push(chalk.gray(`      … ${t('prompt.moreChanges', { count: totalChanges - maxLines })}`));
+    }
+    return output.join('\n');
+}
+/** Build the full diff output */
+function buildFullDiff(localContent, remoteContent) {
+    const lines = diffText(localContent, remoteContent, 3);
+    if (lines.length === 0)
+        return chalk.gray('      (identical)');
+    return lines.map(line => {
+        if (line.type === 'removed')
+            return `      ${chalk.red(`- ${line.content}`)}`;
+        if (line.type === 'added')
+            return `      ${chalk.green(`+ ${line.content}`)}`;
+        return `      ${chalk.gray(`  ${line.content}`)}`;
+    }).join('\n');
+}
 /**
  * Ask how to handle a single conflicting file.
  * When overwrite_all / skip_all is returned, caller should apply to all subsequent conflicts.
+ *
+ * @param localContent  Local file content (for diff preview)
+ * @param remoteContent Remote file content (for diff preview)
+ * @param canMerge      Whether three-way merge is available for this file
  */
-export async function askConflict(repoRel) {
+export async function askConflict(repoRel, localContent, remoteContent, canMerge) {
     if (process.env['WANGCHUAN_NONINTERACTIVE'] === '1' || !process.stdin.isTTY) {
         return NON_INTERACTIVE_DEFAULT;
     }
+    // Build header
+    let header = `\n  ⚡ ${t('prompt.conflict', { file: repoRel })}\n` +
+        `     ${t('prompt.conflictDesc')}\n`;
+    // Show file size comparison if content is available
+    if (localContent !== undefined && remoteContent !== undefined) {
+        const localSize = formatSize(Buffer.byteLength(localContent, 'utf-8'));
+        const remoteSize = formatSize(Buffer.byteLength(remoteContent, 'utf-8'));
+        header += `     ${t('prompt.sizeCompare', { local: localSize, remote: remoteSize })}\n`;
+        // Show compact diff preview
+        const preview = buildDiffPreview(localContent, remoteContent);
+        if (preview) {
+            header += `\n${preview}\n`;
+        }
+    }
+    // Build choices line
+    const mergeChoice = canMerge ? `  [m] ${t('prompt.merge')}` : '';
+    header +=
+        `     ${t('prompt.conflictChoices')}` +
+            `  [d] ${t('prompt.showDiff')}${mergeChoice}\n`;
+    const validChoices = canMerge ? 'o/s/A/S/d/m' : 'o/s/A/S/d';
+    // Interactive loop (allows 'd' to show full diff and re-prompt)
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     return new Promise(resolve => {
-        process.stdout.write(`\n  ⚡ ${t('prompt.conflict', { file: repoRel })}\n` +
-            `     ${t('prompt.conflictDesc')}\n` +
-            `     ${t('prompt.conflictChoices')}\n` +
-            `  ${t('prompt.choose')}`);
-        rl.once('line', (ans) => {
-            rl.close();
-            switch (ans.trim()) {
-                case 'o': return resolve('overwrite');
-                case 'A': return resolve('overwrite_all');
-                case 'S': return resolve('skip_all');
-                case 's':
-                default: return resolve('skip');
-            }
-        });
+        function prompt() {
+            process.stdout.write(header + `  ${t('prompt.choose', { choices: validChoices })}`);
+            rl.once('line', (ans) => {
+                const choice = ans.trim();
+                if (choice === 'd' && localContent !== undefined && remoteContent !== undefined) {
+                    // Show full diff and re-prompt
+                    console.log();
+                    console.log(buildFullDiff(localContent, remoteContent));
+                    console.log();
+                    // Reset header to just choices for re-prompt
+                    header =
+                        `     ${t('prompt.conflictChoices')}` +
+                            `  [d] ${t('prompt.showDiff')}${mergeChoice}\n`;
+                    prompt();
+                    return;
+                }
+                rl.close();
+                switch (choice) {
+                    case 'o': return resolve('overwrite');
+                    case 'A': return resolve('overwrite_all');
+                    case 'S': return resolve('skip_all');
+                    case 'm': return resolve(canMerge ? 'merge' : 'skip');
+                    case 's':
+                    default: return resolve('skip');
+                }
+            });
+        }
+        prompt();
     });
 }
 //# sourceMappingURL=prompt.js.map

package/dist/src/utils/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/utils/prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAS/B,qDAAqD;AACrD,MAAM,uBAAuB,GAAqB,MAAM,CAAC;AAEzD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAe;IAC/C,IAAI,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC5E,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEtF,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,SAAS,CAAC,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,IAAI;YACpD,QAAQ,CAAC,CAAC,qBAAqB,CAAC,IAAI;YACpC,QAAQ,CAAC,CAAC,wBAAwB,CAAC,IAAI;YACvC,KAAK,CAAC,CAAC,eAAe,CAAC,EAAE,CAC1B,CAAC;QAEF,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE;YAC9B,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,QAAQ,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;gBACnB,KAAK,GAAG,CAAC,CAAC,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC;gBACtC,KAAK,GAAG,CAAC,CAAC,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC;gBAC1C,KAAK,GAAG,CAAC,CAAC,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;gBACrC,KAAK,GAAG,CAAC;gBACT,OAAO,CAAC,CAAE,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/utils/prompt.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wangchuan",
-  "version": "2.16.0",
+  "version": "2.17.1",
   "description": "忘川 · AI 记忆同步系统 — 智能体记忆永不遗失",
   "bin": {
     "wangchuan": "./dist/bin/wangchuan.js"

package/skill/claude/SKILL.md

@@ -23,8 +23,8 @@ At the end of each task session, evaluate whether the conversation produced any
 
 | Category | What to look for | Where to update |
 |----------|-----------------|-----------------|
-| **New skill learned** | Reusable workflow, automation pattern, or domain knowledge | Create/update skill in `~/.claude-internal/skills/` |
-| **User preference discovered** | Coding style, tool preference, communication preference | Append to `~/.claude-internal/CLAUDE.md` |
+| **New skill learned** | Reusable workflow, automation pattern, or domain knowledge | Create/update skill in `~/.claude/skills/` |
+| **User preference discovered** | Coding style, tool preference, communication preference | Append to `~/.claude/CLAUDE.md` |
 | **Memory worth preserving** | Key decisions, project context, recurring patterns | Append to agent memory file |
 | **Config change made** | MCP servers added, settings changed, permissions updated | Already tracked by file sync |