@weibaohui/dsh-sync 0.1.3 → 0.1.4

package/README.md

@@ -5,6 +5,8 @@
 
 **多机同步插件**：让多台机器上的 dsh 通过一个私有 GitCode 仓库保持一致——技能、会话、设置、插件清单都能同步。
 
+![多机同步：仓库配置、同步开关与冲突处理](docs/demo.gif)
+
 ## 核心功能
 
 - **四类内容可同步**（各有独立开关）：
@@ -13,7 +15,9 @@
   - 设置（settings.yaml，默认开）
   - 插件清单（各 profile 的依赖与配置，默认开）
 - **分支 → PR → 合并**：每台机器的变更以 PR 形式提交，冲突显化为一个待合并的 PR，绝不静默覆盖
-- **AI 一键解决冲突**：出现冲突时界面冒出「AI 解决冲突」按钮，点击后自动分析两边改动并合并，确定性的 git 操作不用你动手
+- **同步前自动回填**：每次推送前先把远端新增、本机没动过的内容拉回本机，本机快照不会误删别的机器推上来的新技能/新配置
+- **AI 智能对齐**：点「AI 智能对齐」，先自动回填远端新增，再由 AI 对两边都改过的文件做语义合并（动手前自动备份本机文件），合并后自动推送；仍冲突的 PR 顺手解决
+- **AI 一键解决冲突**：出现冲突时设置页冒出「AI 解决冲突」按钮，点击后自动分析两边改动并合并，确定性的 git 操作不用你动手
 - **安全**：强制私有仓库（公共仓库直接拒绝保存）；访问 token 只写不回读
 - **拉取安全**：pull 只回写本地没动过的远端变更，本地改过的内容不会被覆盖
 
@@ -31,4 +35,8 @@ dsh plugin --profile web add @weibaohui/dsh-sync -w
 2. 打开 Web UI → **设置页 → dsh-sync**，填入仓库地址与 access token，保存
 3. 按需开关四类同步内容
 4. 之后每次修改，通过同步操作把本机变更推成 PR；多机之间即可保持一致
-5. 出现冲突时，会话界面会出现「AI 解决冲突」按钮，点一下即可
+5. 日常可点「AI 智能对齐」让 AI 先回填远端新增、语义合并双方改动；出现冲突时设置页会出现「AI 解决冲突」按钮，点一下即可
+
+## 联系我 :飞书群
+
+![link](https://foruda.gitee.com/images/1774880015525784725/4fd67005_77493.png "link")

package/client/bundle.js

@@ -109,6 +109,13 @@ window.__ModuleLoader__.load({
       conflictHint: '检测到未合并的同步 PR（两台机器改了同一文件）。点击下方按钮，AI 会读取本机令牌、分析两边改动、解决冲突并合并 PR。',
       conflictPending: '有未解决的冲突 PR',
       resolveBtn: 'AI 解决冲突',
+      alignBtn: 'AI 智能对齐',
+      alignTitle: 'AI 智能对齐',
+      alignHint: '先自动拉回远端新增内容（不覆盖本机改动），再由 AI 语义合并两边都改过的文件；动手前自动备份本机文件，合并后自动推送，仍冲突的 PR 会顺手解掉。',
+      alignFiles: '待语义合并文件',
+      alignNoFiles: '无双方改动——确定性同步已处理全部差异',
+      alignBackup: '备份目录',
+      reconcileLine: '远端回填 {applied} 项 · 待 AI 对齐 {both} 项',
       openChat: '打开对话',
       running: '执行中…（可能需要几分钟）',
       runDone: '解决完成',
@@ -154,6 +161,13 @@ window.__ModuleLoader__.load({
       conflictHint: 'An unmerged sync PR exists (two machines edited the same file). Click below: the AI reads the local token, analyzes both sides, resolves the conflict and merges the PR.',
       conflictPending: 'Unresolved conflict PR',
       resolveBtn: 'AI resolve conflict',
+      alignBtn: 'AI align',
+      alignTitle: 'AI smart align',
+      alignHint: 'Pulls remote-only changes first (never overwrites local edits), then the AI semantically merges files both sides changed; live files are backed up before merging, the result is pushed automatically, and any still-conflicting PR is resolved in the same run.',
+      alignFiles: 'Files to semantically merge',
+      alignNoFiles: 'No both-side changes — deterministic sync handled everything',
+      alignBackup: 'Backup dir',
+      reconcileLine: 'pulled {applied} remote items · {both} awaiting AI align',
       openChat: 'Open chat',
       running: 'Running… (may take minutes)',
       runDone: 'Resolved',
@@ -259,28 +273,33 @@ window.__ModuleLoader__.load({
       return h('div', { className: 'sk-toast' }, text)
     }
 
-    // ── Conflict-resolution dialog: AI action button + streamed output ──
-    //    (mirrors the skills-management share-run polling pattern)
+    // ── Agent-run dialog: action-button pattern for two modes ──
+    //    conflict: user opens it, then clicks run (needs pending PR info)
+    //    align:    parent already POSTed (which ran a deterministic sync first),
+    //              dialog opens with the job streaming and the both-modified list
+    //    Both poll the same shape of job endpoint and can open the agent session.
 
-    function ConflictDialog({ t, pending, onClose, onToast }) {
-      const [job, setJob] = useState(null)
+    function AgentRunDialog({ t, mode, pending, initial, onClose, onToast }) {
+      const align = mode === 'align'
+      const endpoint = align ? API + '/align/run' : API + '/conflict/run'
+      const [job, setJob] = useState(initial && initial.jobId ? { jobId: initial.jobId, status: 'running', output: '', code: null } : null)
       const [busy, setBusy] = useState(false)
       useEffect(() => {
         if (job === null || job.status !== 'running') return
         const timer = setInterval(() => {
-          getJson(API + '/conflict/run?id=' + encodeURIComponent(job.jobId))
+          getJson(endpoint + '?id=' + encodeURIComponent(job.jobId))
             .then(d => setJob(prev => prev && { ...prev, status: d.status, output: d.output || '', code: d.code, sessionId: d.sessionId || prev.sessionId }))
             .catch(() => {})
         }, 2000)
         if (typeof timer.unref === 'function') timer.unref()
         return () => clearInterval(timer)
-      }, [job && job.status])
+      }, [job && job.status, endpoint])
       const doRun = async () => {
         setBusy(true)
         try {
-          const r = await fetch(API + '/conflict/run', {
+          const r = await fetch(endpoint, {
             method: 'POST', headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ branch: pending && pending.branch, prNumber: pending && pending.prNumber }),
+            body: JSON.stringify(align ? {} : { branch: pending && pending.branch, prNumber: pending && pending.prNumber }),
           })
           const d = await r.json().catch(() => ({}))
           if (!r.ok) throw new Error(d.error || 'HTTP ' + r.status)
@@ -295,12 +314,19 @@ window.__ModuleLoader__.load({
       }
       const row = (label, value) => h('div', { style: { display: 'flex', justifyContent: 'space-between', gap: 12, padding: '3px 0' } },
         h('span', { className: 'sk-dir' }, label), h('span', { className: 'sk-hint', style: { wordBreak: 'break-all', textAlign: 'right' } }, value))
-      return h(SkDialog, { title: t('conflictTitle'), onClose, wide: true },
+      const files = initial && Array.isArray(initial.bothModified) ? initial.bothModified : null
+      return h(SkDialog, { title: align ? t('alignTitle') : t('conflictTitle'), onClose, wide: true },
         h('div', { style: { display: 'flex', flexDirection: 'column', gap: 10, minWidth: 380 } },
-          h('div', { className: 'sk-hint' }, t('conflictHint')),
-          pending && h('div', null,
+          h('div', { className: 'sk-hint' }, align ? t('alignHint') : t('conflictHint')),
+          !align && pending && h('div', null,
             row('PR', '#' + (pending.prNumber || '-')),
             row('Branch', pending.branch || '-')),
+          align && h('div', { className: 'sk-card' },
+            h('div', { className: 'sk-dir', style: { marginBottom: 4 } }, t('alignFiles')),
+            files && files.length
+              ? h('pre', { style: { margin: 0, whiteSpace: 'pre-wrap', fontSize: 12, maxHeight: 120, overflow: 'auto' } }, files.join('\n'))
+              : h('div', { className: 'sk-hint' }, t('alignNoFiles')),
+            initial && initial.backupDir && row(t('alignBackup'), initial.backupDir)),
           job !== null && h('div', null,
             h('div', { className: 'sk-dir', style: { margin: '4px 0' } },
               t('outputLabel') + ' · ' + (job.status === 'running' ? t('running') : job.status === 'done' ? t('runDone') : t('runFailed') + (job.code != null ? ' (' + job.code + ')' : ''))),
@@ -308,7 +334,7 @@ window.__ModuleLoader__.load({
               job.output || '…')),
           h('div', { className: 'sk-dlg-foot', style: { marginTop: 0 } },
             job !== null && job.sessionId && sessionsSvc() && h(ButtonLite, { onClick: openChat }, t('openChat')),
-            h(ButtonLite, { primary: true, disabled: busy || (job !== null && job.status === 'running'), onClick: doRun },
+            !align && h(ButtonLite, { primary: true, disabled: busy || (job !== null && job.status === 'running'), onClick: doRun },
               job !== null && job.status === 'running' ? t('running') : t('resolveBtn')))))
     }
 
@@ -317,7 +343,10 @@ window.__ModuleLoader__.load({
     function SettingsSection({ t }) {
       const [status, setStatus] = useState(null)
       const [busy, setBusy] = useState(false)
+      const [alignBusy, setAlignBusy] = useState(false)
       const [conflictOpen, setConflictOpen] = useState(false)
+      const [alignOpen, setAlignOpen] = useState(false)
+      const [alignInitial, setAlignInitial] = useState(null)
       const [toastText, setToastText] = useState(null)
       const [repoUrl, setRepoUrl] = useState('')
       const [branch, setBranch] = useState('')
@@ -356,6 +385,20 @@ window.__ModuleLoader__.load({
         } catch (e) { onToast(t('syncFailed') + ': ' + e.message, 4000) }
         finally { setBusy(false); refresh() }
       }
+      // AI smart align: POST runs a deterministic sync first (remote-only files
+      // pulled back), then streams the semantic-merge agent run; dialog opens
+      // already running with the both-modified file list.
+      const doAlign = async () => {
+        setAlignBusy(true)
+        try {
+          const r = await fetch(API + '/align/run', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: '{}' })
+          const d = await r.json().catch(() => ({}))
+          if (!r.ok) throw new Error(d.error || 'HTTP ' + r.status)
+          setAlignInitial({ jobId: d.jobId, bothModified: d.bothModified || [], backupDir: d.backupDir })
+          setAlignOpen(true)
+        } catch (e) { onToast(e.message || t('operationFailed'), 4000) }
+        finally { setAlignBusy(false); refresh() }
+      }
       const putSettings = async (patch) => {
         const r = await fetch(API + '/settings', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(patch) })
         const d = await r.json().catch(() => ({}))
@@ -405,6 +448,13 @@ window.__ModuleLoader__.load({
                 row(t('branchLabel'), status.branch || '-'),
                 row(t('dirLabel'), status.dir),
                 row(t('lastSyncLabel'), status.lastSyncAt ? formatTime(status.lastSyncAt) : t('repoMissing'))),
+              (() => {
+                const rec = status.lastResult && status.lastResult.reconcile
+                const applied = rec && Array.isArray(rec.applied) ? rec.applied.length : 0
+                const both = rec && Array.isArray(rec.bothModified) ? rec.bothModified.length : 0
+                if (!rec || (!applied && !both)) return null
+                return h(Tag, { tone: both ? 'danger' : 'accent' }, t('reconcileLine', { applied, both }))
+              })(),
               h('div', null,
                 h('div', { className: 'sk-dir', style: { margin: '4px 0' } }, t('groupHint')),
                 h('div', { className: 'sk-toggles' },
@@ -436,7 +486,12 @@ window.__ModuleLoader__.load({
               h('div', { className: 'sk-toolbar' },
                 h(ButtonLite, { onClick: doSave }, t('save')),
                 h('span', { className: 'sk-spacer' }),
-                h(ButtonLite, { primary: true, disabled: busy || status.syncing, onClick: doSync }, busy ? t('syncing') : t('syncNow'))))
+                h(ButtonLite, {
+                  disabled: alignBusy || status.syncing || !status.repoUrl || !status.hasToken,
+                  title: !status.repoUrl || !status.hasToken ? t('notConfigured') : undefined,
+                  onClick: doAlign,
+                }, alignBusy ? t('running') : t('alignBtn')),
+                h(ButtonLite, { primary: true, disabled: busy || status.syncing || alignBusy, onClick: doSync }, busy ? t('syncing') : t('syncNow'))))
       } catch (renderErr) {
         ;(globalThis.__skErrors = globalThis.__skErrors || []).push('body: ' + (renderErr && renderErr.message))
         body = h('div', { className: 'sk-card', style: { color: 'var(--dsw-alias-state-error-primary)' } },
@@ -445,8 +500,11 @@ window.__ModuleLoader__.load({
 
       return h('div', { className: 'sk-page' },
         h('div', { className: 'sk-body' }, body),
-        conflictOpen && status && status.pendingConflict && h(ConflictDialog, {
-          t, pending: status.pendingConflict, onClose: () => setConflictOpen(false), onToast,
+        conflictOpen && status && status.pendingConflict && h(AgentRunDialog, {
+          t, mode: 'conflict', pending: status.pendingConflict, onClose: () => setConflictOpen(false), onToast,
+        }),
+        alignOpen && h(AgentRunDialog, {
+          t, mode: 'align', initial: alignInitial, onClose: () => setAlignOpen(false), onToast,
         }),
         toastText && h(InToast, { text: toastText }),
       )

package/client/index.js

@@ -99,6 +99,13 @@ const ZH = {
   conflictHint: '检测到未合并的同步 PR（两台机器改了同一文件）。点击下方按钮，AI 会读取本机令牌、分析两边改动、解决冲突并合并 PR。',
   conflictPending: '有未解决的冲突 PR',
   resolveBtn: 'AI 解决冲突',
+  alignBtn: 'AI 智能对齐',
+  alignTitle: 'AI 智能对齐',
+  alignHint: '先自动拉回远端新增内容（不覆盖本机改动），再由 AI 语义合并两边都改过的文件；动手前自动备份本机文件，合并后自动推送，仍冲突的 PR 会顺手解掉。',
+  alignFiles: '待语义合并文件',
+  alignNoFiles: '无双方改动——确定性同步已处理全部差异',
+  alignBackup: '备份目录',
+  reconcileLine: '远端回填 {applied} 项 · 待 AI 对齐 {both} 项',
   openChat: '打开对话',
   running: '执行中…（可能需要几分钟）',
   runDone: '解决完成',
@@ -144,6 +151,13 @@ const EN = {
   conflictHint: 'An unmerged sync PR exists (two machines edited the same file). Click below: the AI reads the local token, analyzes both sides, resolves the conflict and merges the PR.',
   conflictPending: 'Unresolved conflict PR',
   resolveBtn: 'AI resolve conflict',
+  alignBtn: 'AI align',
+  alignTitle: 'AI smart align',
+  alignHint: 'Pulls remote-only changes first (never overwrites local edits), then the AI semantically merges files both sides changed; live files are backed up before merging, the result is pushed automatically, and any still-conflicting PR is resolved in the same run.',
+  alignFiles: 'Files to semantically merge',
+  alignNoFiles: 'No both-side changes — deterministic sync handled everything',
+  alignBackup: 'Backup dir',
+  reconcileLine: 'pulled {applied} remote items · {both} awaiting AI align',
   openChat: 'Open chat',
   running: 'Running… (may take minutes)',
   runDone: 'Resolved',
@@ -249,28 +263,33 @@ function InToast({ text }) {
   return h('div', { className: 'sk-toast' }, text)
 }
 
-// ── Conflict-resolution dialog: AI action button + streamed output ──
-//    (mirrors the skills-management share-run polling pattern)
+// ── Agent-run dialog: action-button pattern for two modes ──
+//    conflict: user opens it, then clicks run (needs pending PR info)
+//    align:    parent already POSTed (which ran a deterministic sync first),
+//              dialog opens with the job streaming and the both-modified list
+//    Both poll the same shape of job endpoint and can open the agent session.
 
-function ConflictDialog({ t, pending, onClose, onToast }) {
-  const [job, setJob] = useState(null)
+function AgentRunDialog({ t, mode, pending, initial, onClose, onToast }) {
+  const align = mode === 'align'
+  const endpoint = align ? API + '/align/run' : API + '/conflict/run'
+  const [job, setJob] = useState(initial && initial.jobId ? { jobId: initial.jobId, status: 'running', output: '', code: null } : null)
   const [busy, setBusy] = useState(false)
   useEffect(() => {
     if (job === null || job.status !== 'running') return
     const timer = setInterval(() => {
-      getJson(API + '/conflict/run?id=' + encodeURIComponent(job.jobId))
+      getJson(endpoint + '?id=' + encodeURIComponent(job.jobId))
         .then(d => setJob(prev => prev && { ...prev, status: d.status, output: d.output || '', code: d.code, sessionId: d.sessionId || prev.sessionId }))
         .catch(() => {})
     }, 2000)
     if (typeof timer.unref === 'function') timer.unref()
     return () => clearInterval(timer)
-  }, [job && job.status])
+  }, [job && job.status, endpoint])
   const doRun = async () => {
     setBusy(true)
     try {
-      const r = await fetch(API + '/conflict/run', {
+      const r = await fetch(endpoint, {
         method: 'POST', headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ branch: pending && pending.branch, prNumber: pending && pending.prNumber }),
+        body: JSON.stringify(align ? {} : { branch: pending && pending.branch, prNumber: pending && pending.prNumber }),
       })
       const d = await r.json().catch(() => ({}))
       if (!r.ok) throw new Error(d.error || 'HTTP ' + r.status)
@@ -285,12 +304,19 @@ function ConflictDialog({ t, pending, onClose, onToast }) {
   }
   const row = (label, value) => h('div', { style: { display: 'flex', justifyContent: 'space-between', gap: 12, padding: '3px 0' } },
     h('span', { className: 'sk-dir' }, label), h('span', { className: 'sk-hint', style: { wordBreak: 'break-all', textAlign: 'right' } }, value))
-  return h(SkDialog, { title: t('conflictTitle'), onClose, wide: true },
+  const files = initial && Array.isArray(initial.bothModified) ? initial.bothModified : null
+  return h(SkDialog, { title: align ? t('alignTitle') : t('conflictTitle'), onClose, wide: true },
     h('div', { style: { display: 'flex', flexDirection: 'column', gap: 10, minWidth: 380 } },
-      h('div', { className: 'sk-hint' }, t('conflictHint')),
-      pending && h('div', null,
+      h('div', { className: 'sk-hint' }, align ? t('alignHint') : t('conflictHint')),
+      !align && pending && h('div', null,
         row('PR', '#' + (pending.prNumber || '-')),
         row('Branch', pending.branch || '-')),
+      align && h('div', { className: 'sk-card' },
+        h('div', { className: 'sk-dir', style: { marginBottom: 4 } }, t('alignFiles')),
+        files && files.length
+          ? h('pre', { style: { margin: 0, whiteSpace: 'pre-wrap', fontSize: 12, maxHeight: 120, overflow: 'auto' } }, files.join('\n'))
+          : h('div', { className: 'sk-hint' }, t('alignNoFiles')),
+        initial && initial.backupDir && row(t('alignBackup'), initial.backupDir)),
       job !== null && h('div', null,
         h('div', { className: 'sk-dir', style: { margin: '4px 0' } },
           t('outputLabel') + ' · ' + (job.status === 'running' ? t('running') : job.status === 'done' ? t('runDone') : t('runFailed') + (job.code != null ? ' (' + job.code + ')' : ''))),
@@ -298,7 +324,7 @@ function ConflictDialog({ t, pending, onClose, onToast }) {
           job.output || '…')),
       h('div', { className: 'sk-dlg-foot', style: { marginTop: 0 } },
         job !== null && job.sessionId && sessionsSvc() && h(ButtonLite, { onClick: openChat }, t('openChat')),
-        h(ButtonLite, { primary: true, disabled: busy || (job !== null && job.status === 'running'), onClick: doRun },
+        !align && h(ButtonLite, { primary: true, disabled: busy || (job !== null && job.status === 'running'), onClick: doRun },
           job !== null && job.status === 'running' ? t('running') : t('resolveBtn')))))
 }
 
@@ -307,7 +333,10 @@ function ConflictDialog({ t, pending, onClose, onToast }) {
 function SettingsSection({ t }) {
   const [status, setStatus] = useState(null)
   const [busy, setBusy] = useState(false)
+  const [alignBusy, setAlignBusy] = useState(false)
   const [conflictOpen, setConflictOpen] = useState(false)
+  const [alignOpen, setAlignOpen] = useState(false)
+  const [alignInitial, setAlignInitial] = useState(null)
   const [toastText, setToastText] = useState(null)
   const [repoUrl, setRepoUrl] = useState('')
   const [branch, setBranch] = useState('')
@@ -346,6 +375,20 @@ function SettingsSection({ t }) {
     } catch (e) { onToast(t('syncFailed') + ': ' + e.message, 4000) }
     finally { setBusy(false); refresh() }
   }
+  // AI smart align: POST runs a deterministic sync first (remote-only files
+  // pulled back), then streams the semantic-merge agent run; dialog opens
+  // already running with the both-modified file list.
+  const doAlign = async () => {
+    setAlignBusy(true)
+    try {
+      const r = await fetch(API + '/align/run', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: '{}' })
+      const d = await r.json().catch(() => ({}))
+      if (!r.ok) throw new Error(d.error || 'HTTP ' + r.status)
+      setAlignInitial({ jobId: d.jobId, bothModified: d.bothModified || [], backupDir: d.backupDir })
+      setAlignOpen(true)
+    } catch (e) { onToast(e.message || t('operationFailed'), 4000) }
+    finally { setAlignBusy(false); refresh() }
+  }
   const putSettings = async (patch) => {
     const r = await fetch(API + '/settings', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(patch) })
     const d = await r.json().catch(() => ({}))
@@ -395,6 +438,13 @@ function SettingsSection({ t }) {
             row(t('branchLabel'), status.branch || '-'),
             row(t('dirLabel'), status.dir),
             row(t('lastSyncLabel'), status.lastSyncAt ? formatTime(status.lastSyncAt) : t('repoMissing'))),
+          (() => {
+            const rec = status.lastResult && status.lastResult.reconcile
+            const applied = rec && Array.isArray(rec.applied) ? rec.applied.length : 0
+            const both = rec && Array.isArray(rec.bothModified) ? rec.bothModified.length : 0
+            if (!rec || (!applied && !both)) return null
+            return h(Tag, { tone: both ? 'danger' : 'accent' }, t('reconcileLine', { applied, both }))
+          })(),
           h('div', null,
             h('div', { className: 'sk-dir', style: { margin: '4px 0' } }, t('groupHint')),
             h('div', { className: 'sk-toggles' },
@@ -426,7 +476,12 @@ function SettingsSection({ t }) {
           h('div', { className: 'sk-toolbar' },
             h(ButtonLite, { onClick: doSave }, t('save')),
             h('span', { className: 'sk-spacer' }),
-            h(ButtonLite, { primary: true, disabled: busy || status.syncing, onClick: doSync }, busy ? t('syncing') : t('syncNow'))))
+            h(ButtonLite, {
+              disabled: alignBusy || status.syncing || !status.repoUrl || !status.hasToken,
+              title: !status.repoUrl || !status.hasToken ? t('notConfigured') : undefined,
+              onClick: doAlign,
+            }, alignBusy ? t('running') : t('alignBtn')),
+            h(ButtonLite, { primary: true, disabled: busy || status.syncing || alignBusy, onClick: doSync }, busy ? t('syncing') : t('syncNow'))))
   } catch (renderErr) {
     ;(globalThis.__skErrors = globalThis.__skErrors || []).push('body: ' + (renderErr && renderErr.message))
     body = h('div', { className: 'sk-card', style: { color: 'var(--dsw-alias-state-error-primary)' } },
@@ -435,8 +490,11 @@ function SettingsSection({ t }) {
 
   return h('div', { className: 'sk-page' },
     h('div', { className: 'sk-body' }, body),
-    conflictOpen && status && status.pendingConflict && h(ConflictDialog, {
-      t, pending: status.pendingConflict, onClose: () => setConflictOpen(false), onToast,
+    conflictOpen && status && status.pendingConflict && h(AgentRunDialog, {
+      t, mode: 'conflict', pending: status.pendingConflict, onClose: () => setConflictOpen(false), onToast,
+    }),
+    alignOpen && h(AgentRunDialog, {
+      t, mode: 'align', initial: alignInitial, onClose: () => setAlignOpen(false), onToast,
     }),
     toastText && h(InToast, { text: toastText }),
   )

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weibaohui/dsh-sync",
-  "version": "0.1.3",
-  "description": "dsh 插件 · 多机同步：让多台机器上的 dsh 通过一个私有 GitCode 仓库保持一致——技能、会话、设置、插件清单四类内容各有独立开关；变更走分支 → PR → 合并，冲突显化为待合并 PR，支持 AI 一键解决冲突；强制私有仓库，pull 不覆盖本地改动。",
+  "version": "0.1.4",
+  "description": "dsh 插件 · 多机同步：让多台机器上的 dsh 通过一个私有 GitCode 仓库保持一致——技能、会话、设置、插件清单四类内容各有独立开关；变更走分支 → PR → 合并，推送前自动回填远端新增防误删，支持 AI 智能对齐（语义合并双方改动）与一键解决冲突；强制私有仓库，pull 不覆盖本地改动。",
   "license": "MIT",
   "keywords": [
     "dsh",
@@ -30,6 +30,7 @@
   "files": [
     "src",
     "client",
+    "docs",
     "cordis.patch.yml"
   ],
   "scripts": {

package/src/index.js

@@ -489,6 +489,62 @@ async function runPull(binary, eff, { repoDir, state, logger, roots }) {
   return { pulled: true, applied, skipped, changed: changed.length }
 }
 
+// ── Pre-push reconcile: pull remote changes back into live BEFORE the
+//    snapshot push. The push mirror is a full-directory overlay (rm + copy),
+//    so without this step a file another machine added — and this replica
+//    hasn't pulled yet — gets deleted in the push branch and flaps out of
+//    the remote. Remote-only and locally-untouched files are written back
+//    here (purely deterministic, never overwrites local work); files both
+//    sides changed are reported as `bothModified` for the AI align step /
+//    conflict PR. Remote deletions are never mirrored into live. ──
+
+async function reconcileRemote(binary, eff, { repoDir, state, logger, roots }) {
+  const fs = require('node:fs')
+  try { await fs.promises.access(join(repoDir, '.git')) } catch { return { reconciled: false, noShadow: true } }
+  const remote = authedUrl(eff.repoUrl, eff.token)
+  const spec = syncSpec(eff, roots)
+  try { await gitExec(binary, ['fetch', remote, eff.branch], repoDir) } catch (e) {
+    if (!/Could not find|doesn't exist|no such|empty/i.test(String(e && e.message))) throw e
+    return { reconciled: false, empty: true }
+  }
+  const hasFetch = await gitExec(binary, ['rev-parse', '--verify', 'FETCH_HEAD'], repoDir).then(() => true).catch(() => false)
+  if (!hasFetch) return { reconciled: false, empty: true }
+  const lastSynced = state.lastSyncedCommit
+  if (!lastSynced) {
+    // never synced: nothing to diff against; just record the baseline
+    await gitExec(binary, ['checkout', eff.branch], repoDir).catch(() => {})
+    await gitExec(binary, ['reset', '--hard', 'FETCH_HEAD'], repoDir).catch(() => {})
+    state.lastSyncedCommit = await gitCurrentCommit(binary, repoDir)
+    return { reconciled: false, firstBaseline: true }
+  }
+  let changedRaw = ''
+  try { changedRaw = await gitExec(binary, ['diff', '--name-only', lastSynced, 'FETCH_HEAD'], repoDir) } catch {}
+  const changed = changedRaw.split(/\r?\n/).map(s => s.trim()).filter(Boolean)
+  const applied = []        // safely written back to live
+  const bothModified = []   // both sides changed → AI align / conflict PR
+  const remoteDeleted = []  // gone on remote; live keeps its copy
+  for (const p of changed) {
+    const livePath = resolveLivePath(spec, p)
+    if (!livePath) continue
+    let remoteBuf = null
+    try { remoteBuf = await gitShowBuf(binary, `FETCH_HEAD:${p}`, repoDir) } catch { remoteBuf = null }
+    if (remoteBuf === null) { remoteDeleted.push(p); continue }
+    let liveBuf = null
+    try { liveBuf = await fsP.readFile(livePath) } catch {}
+    let lastSyncedBuf = null
+    try { lastSyncedBuf = await gitShowBuf(binary, `${lastSynced}:${p}`, repoDir) } catch { lastSyncedBuf = Buffer.alloc(0) }
+    const untouched = liveBuf === null ? (lastSyncedBuf.length === 0) : Buffer.compare(liveBuf, lastSyncedBuf) === 0
+    if (!untouched) { bothModified.push({ shadowPath: p, livePath }); continue }
+    try { await atomicWriteFile(livePath, remoteBuf); applied.push(p) } catch {}
+  }
+  // advance shadow baseline to FETCH_HEAD — safe items now match live, so the
+  // subsequent push overlay keeps every remote-only file instead of deleting it
+  await gitExec(binary, ['checkout', eff.branch], repoDir).catch(() => {})
+  await gitExec(binary, ['reset', '--hard', 'FETCH_HEAD'], repoDir).catch(() => {})
+  state.lastSyncedCommit = await gitCurrentCommit(binary, repoDir)
+  return { reconciled: true, applied, bothModified, remoteDeleted, changed: changed.length }
+}
+
 // ── Conflict-resolution action button: in-process agent (same channel as
 //    skills-management share-run). The agent operates the shadow repo's git
 //    directly + merges the PR via REST. Only this step needs semantic
@@ -532,6 +588,46 @@ function substituteParams(template, params) {
   return out
 }
 
+// ── AI align action button: semantic merge of files both sides changed.
+//    Deterministic reconcile (remote-only pull-back) already ran in the host
+//    before this prompt is built; the agent only does the semantic judgement
+//    on the reported both-modified files, then triggers a normal sync and
+//    falls back to conflict resolution if a PR still can't merge. ──
+
+const ALIGN_PROMPT_ZH = [
+  '请执行 dsh-sync 的「AI 智能对齐」：把本机与远端都改过的文件做语义合并，然后触发一次同步完成推送。',
+  '',
+  '## 路径信息',
+  '- 影子仓库（git 工作树，只读用于取版本）：{{shadowDir}}',
+  '- 本机 live 同步根：',
+  '  - 技能（dsh）：{{skillsDsh}}',
+  '  - 技能（agents）：{{skillsAgents}}',
+  '  - 会话：{{sessions}}',
+  '  - 设置文件：{{settingsFile}}',
+  '  - 插件清单：{{profiles}}',
+  '- 影子路径 → live 路径映射：`skills/dsh/**` → 技能（dsh）根；`skills/agents/**` → 技能（agents）根；`skills/.skill-lock.json` → agents 根下 `.skill-lock.json`；`sessions/**` → 会话根；`settings/settings.yaml` → 设置文件；`plugins/**` → 插件清单根。',
+  '- 备份目录：{{backupDir}}（改动前把 live 原文件按影子相对路径复制进去）',
+  '- 本机 dsh web 地址：{{apiBase}}（用它触发同步，不需要令牌）',
+  '- 访问令牌：{{token}}（仅兜底直接调 GitCode API 时用，严禁回显）',
+  '',
+  '## 待合并文件（两边都改过，共 {{fileCount}} 个）',
+  '{{fileList}}',
+  '每个文件的三个版本：本机版直接读 live 路径；远端版 `git -C {{shadowDir}} show FETCH_HEAD:<影子路径>`；共同基线 `git -C {{shadowDir}} show {{lastSynced}}:<影子路径>`（可能不存在）。',
+  '',
+  '## 规则（硬性）',
+  '1. 只允许修改上面清单里的 live 文件；**不得删除**任何 live 文件或远端独有内容；不准碰同步根之外的文件。',
+  '2. 动手前把每个 live 原文件备份到 {{backupDir}}（保持影子相对路径的子目录结构）。',
+  '3. 文本文件（.md/.json/.yaml/.yml/明文 .jsonl）做三方语义合并，保留两边有效改动。技能/专家目录：两边各自新增的文件取并集（都保留），仅同名文件才合并内容。',
+  '4. settings.yaml 逐键保留双方；本机路径/机器相关字段以本机为准；任何 token/apiKey/密钥字段保留两边但**严禁在输出中回显密钥值**。',
+  '5. 二进制或压缩文件（.zst/.gz 及 session 日志二进制）不合并，保留本机版，在汇报里列出。',
+  '6. 只允许使用 bash 与 HTTP 请求工具；严禁使用 return/deliver/投递/IM 文件类工具；不要 printenv；令牌不得出现在任何输出或提交信息里。',
+  '7. 合并完成后触发确定性同步：`curl -s -X POST {{apiBase}}/dsh-sync/api/sync`，等待返回 JSON。',
+  '8. 再查状态：`curl -s {{apiBase}}/dsh-sync/api/status`。若 pendingConflict 非空（仍有冲突 PR）：在影子仓库 `git fetch https://oauth2:<令牌>@gitcode.com/<owner>/<repo>.git <分支>` → checkout 该分支 → `git merge FETCH_HEAD` → 按上述规则解冲突 → `git add -A && git -c user.name=dsh-sync -c user.email=dsh-sync@local commit --no-edit` → push 回该分支 → 调 GitCode API 合并 PR（头用 `PRIVATE-TOKEN: <令牌>`，不要用 Authorization: Bearer；`PUT /repos/<owner>/<repo>/pulls/<编号>/merge`，body `{"merge_method":"squash"}`）。',
+  '9. 全程使用中文。最后汇报：备份了哪些文件、每个文件怎么合并的、同步触发结果、PR 编号与链接（若有）。',
+  '',
+  '若待合并文件清单为空，跳过合并直接执行第 7 步，并汇报同步结果。',
+].join('\n')
+
 // apiproxy client: dsh web 的 /api HTTP RPC（web 客户端同款），创建主对话级 session。
 // 关键区别：apiproxy session.create 建的是 web 主对话级 agent（agentPreset=standard
 // + dsh-base 全工具，含 bash——实测 tool/call=bash + pwd 跑通）；而 agents.create 子 agent
@@ -551,7 +647,7 @@ async function apiproxy(method, payload) {
   return res.value
 }
 
-async function runConflictViaApiproxy({ prompt, dir, job, sessions, logger, token }) {
+async function runAgentViaApiproxy({ prompt, dir, job, sessions, logger, token }) {
   // token 经 prompt 内联（{{token}}）--apiproxy 主对话级 session 的 bash 是 host-plane
   // executor，不继承 dsh web 进程的 process.env，故不能像 headless spawn 那样 env 注入
   try {
@@ -611,18 +707,18 @@ async function runConflictViaApiproxy({ prompt, dir, job, sessions, logger, toke
   return job
 }
 
-function createConflictRunJob({ prompt, dir, jobs, logger, sessions, token }) {
-  const id = 'cf' + Date.now().toString(36) + Math.random().toString(36).slice(2, 8)
+function createAgentRunJob({ prompt, dir, jobs, logger, sessions, token }) {
+  const id = 'ag' + Date.now().toString(36) + Math.random().toString(36).slice(2, 8)
   const job = { id, status: 'running', startedAt: new Date().toISOString(), dir, output: '', code: null }
   jobs.set(id, job)
   // 走 apiproxy 创建主对话级 session（standard preset + dsh-base 全工具，含 bash），
-  // 不是 agents.create 子 agent（精简无 bash）。token 注入 env，events 经 ctx.sessions.get 流式读。
+  // 不是 agents.create 子 agent（精简无 bash）。token 注入 prompt，events 经 ctx.sessions.get 流式读。
   if (!sessions || typeof sessions.get !== 'function') {
     job.status = 'error'
     job.output = 'sessions 服务不可用（动态 ctx.inject 失败）'
     return job
   }
-  runConflictViaApiproxy({ prompt, dir, job, sessions, logger, token })
+  runAgentViaApiproxy({ prompt, dir, job, sessions, logger, token })
     .catch(e => { job.status = 'error'; job.output = (job.output + '\n' + String(e && e.message)).slice(-CONFLICT_RUN_OUTPUT_CAP) })
   return job
 }
@@ -630,7 +726,7 @@ function createConflictRunJob({ prompt, dir, jobs, logger, sessions, token }) {
 module.exports = {
   name: 'dsh-sync',
   inject: ['webServer', 'settings'],
-  __internals: { syncSpec, defaultRoots, parseRepoUrl, authedUrl, mirrorLiveToShadow, resolveLivePath, copyTree, gitExec, acquireLock, checkRepoPrivate, gitcodeRequest, ensureShadowRepo, runPush, runPull, gitCurrentCommit, atomicWriteFile, DEFAULT_SYNC_SETTINGS, CONFLICT_PROMPT_ZH, substituteParams },
+  __internals: { syncSpec, defaultRoots, parseRepoUrl, authedUrl, mirrorLiveToShadow, resolveLivePath, copyTree, gitExec, acquireLock, checkRepoPrivate, gitcodeRequest, ensureShadowRepo, runPush, runPull, reconcileRemote, gitCurrentCommit, atomicWriteFile, DEFAULT_SYNC_SETTINGS, CONFLICT_PROMPT_ZH, ALIGN_PROMPT_ZH, substituteParams },
 
   apply(ctx, config = {}) {
     const dh = dshHome()
@@ -709,6 +805,9 @@ module.exports = {
         let result = { pushed: false, pulled: false }
         try {
           const ctx2 = { repoDir, instanceId: state.instanceId, state, logger: ctx.logger }
+          // reconcile first: pull remote-only/untouched changes into live so
+          // the full-snapshot push below never deletes another replica's adds
+          result.reconcile = await reconcileRemote(eff.gitBinary, eff, ctx2).catch(e => { result.reconcileError = String(e && e.message); return null })
           result.push = await runPush(eff.gitBinary, eff, ctx2).catch(e => { result.pushError = String(e && e.message); return null })
           result.pull = await runPull(eff.gitBinary, eff, ctx2).catch(e => { result.pullError = String(e && e.message); return null })
           state.lastSyncAt = new Date().toISOString()
@@ -720,9 +819,11 @@ module.exports = {
       return syncRun
     }
 
-    // ── Conflict-resolution jobs (action button → apiproxy 主对话级 session) ──
+    // ── Agent-run jobs (action buttons → apiproxy 主对话级 session) ──
+    // conflictRunJobs: 冲突 PR 解决；alignRunJobs: AI 智能对齐（语义合并双方改动）
     const conflictRunJobs = new Map()
-    // 动态注入 sessions 服务：conflict 走 apiproxy 创建主对话级 session 后，
+    const alignRunJobs = new Map()
+    // 动态注入 sessions 服务：agent run 走 apiproxy 创建主对话级 session 后，
     // 用 ctx.sessions.get(sessionId).events 流式读 agent 输出（像 agents.create 事件泵，
     // 但这个 agent 有 bash）
     let sessionsSvc = null
@@ -830,7 +931,7 @@ module.exports = {
             const prompt = substituteParams(CONFLICT_PROMPT_ZH, {
               repoUrl: eff.repoUrl, shadowDir: repoDir, branch, prNumber, token: eff.token,
             })
-            const job = createConflictRunJob({ prompt, dir: repoDir, jobs: conflictRunJobs, logger: ctx.logger, sessions: sessionsSvc, token: eff.token })
+            const job = createAgentRunJob({ prompt, dir: repoDir, jobs: conflictRunJobs, logger: ctx.logger, sessions: sessionsSvc, token: eff.token })
             sendJson(res, 202, { jobId: job.id, status: job.status })
             return
           }
@@ -844,6 +945,51 @@ module.exports = {
             return
           }
 
+          // POST /dsh-sync/api/align/run → AI 智能对齐：先跑一次确定性同步
+          // （远端新增自动回填），再把两边都改过的文件交 agent 语义合并
+          if (req.method === 'POST' && apiPath.endsWith('/dsh-sync/api/align/run')) {
+            await stateLoaded
+            const eff = syncSettings()
+            if (!eff.repoUrl || !eff.token) { sendJson(res, 400, { error: '未配置仓库或令牌' }); return }
+            const baseCommit = state.lastSyncedCommit   // 双方分叉的共同基线（reconcile 前）
+            let syncResult = null
+            try { syncResult = await runSync() }
+            catch (e) { sendJson(res, 400, { error: '同步预检失败：' + String(e && e.message || e) }); return }
+            const rec = syncResult && syncResult.reconcile
+            const both = (rec && Array.isArray(rec.bothModified)) ? rec.bothModified : []
+            const fileList = both.length
+              ? both.map((f, i) => `${i + 1}. ${f.shadowPath}（本机：${displayPath(f.livePath)}）`).join('\n')
+              : '（无——确定性同步已处理全部差异）'
+            const roots = defaultRoots()
+            const backupDir = join(syncDir, 'align-backups', new Date().toISOString().replace(/[:.]/g, '-'))
+            await fsP.mkdir(backupDir, { recursive: true })
+            const prompt = substituteParams(ALIGN_PROMPT_ZH, {
+              shadowDir: repoDir,
+              skillsDsh: roots.dshSkills, skillsAgents: roots.agentsSkills,
+              sessions: roots.sessions, settingsFile: roots.settingsFile, profiles: roots.profiles,
+              backupDir, apiBase: APIPROXY_BASE, token: eff.token,
+              fileCount: both.length, fileList,
+              lastSynced: baseCommit || '（无共同基线，仓库首次同步）',
+            })
+            const job = createAgentRunJob({ prompt, dir: repoDir, jobs: alignRunJobs, logger: ctx.logger, sessions: sessionsSvc, token: eff.token })
+            sendJson(res, 202, {
+              jobId: job.id, status: job.status,
+              bothModified: both.map(f => f.shadowPath),
+              backupDir: displayPath(backupDir),
+              reconcile: rec ? { applied: rec.applied, bothModified: rec.bothModified.length, remoteDeleted: rec.remoteDeleted } : null,
+            })
+            return
+          }
+
+          // GET /dsh-sync/api/align/run?id= → job status/output
+          if (req.method === 'GET' && apiPath.endsWith('/dsh-sync/api/align/run')) {
+            const id = query.get('id') || ''
+            const job = alignRunJobs.get(id)
+            if (job === undefined) { sendJson(res, 404, { error: 'job not found' }); return }
+            sendJson(res, 200, { ...job, output: (job.output || '').slice(-32 * 1024) })
+            return
+          }
+
           sendJson(res, 404, { error: 'not found' })
         } catch (error) { sendJson(res, 400, { error: String(error && error.message || error) }) }
       },