dsh-ccswitch-sync 0.1.0 → 0.1.1

package/README.md

@@ -131,7 +131,7 @@ on the next run.
 ## Development
 
 ```sh
-node --test test/sync.test.mjs     # splicing: idempotency, markers, stray rows
+npm test                           # splicing (idempotency, markers, BOM) + file-level sync
 node scripts/check-manifest.mjs    # dependency-free manifest shape check
 ```
 

package/README.zh.md

@@ -125,7 +125,7 @@ dsh plugin --profile dsh-tui remove dsh-ccswitch-sync
 ## 开发
 
 ```sh
-node --test test/sync.test.mjs     # 拼接逻辑：幂等、标记、残留行
+npm test                           # 拼接逻辑（幂等、标记、BOM）+ 文件级同步
 node scripts/check-manifest.mjs    # 无依赖的清单形状检查
 ```
 

package/dsh-plugin.json

@@ -2,7 +2,7 @@
   "$schema": "https://unpkg.com/@dsh-std/manifest@0.1.1-rc.2/schema/dsh-plugin-0.15.schema.json",
   "id": "msyzzm.dsh-ccswitch-sync",
   "name": "CC Switch → dsh-TUI sync",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "manifestVersion": "0.15",
   "facets": {
     "host": {

package/lib/index.js

@@ -15,14 +15,11 @@
  */
 import { appendFile, mkdir, readFile, stat } from 'node:fs/promises'
 import { appendFileSync } from 'node:fs'
-import { homedir } from 'node:os'
 import { join } from 'node:path'
-import { defaultPaths, syncOnce } from './sync.mjs'
+import { STATE_DIR, defaultPaths, syncOnce } from './sync.mjs'
 
 export const name = 'ccswitch-sync'
 
-const HOME = homedir()
-const STATE_DIR = join(HOME, '.dsh-tui', 'ccswitch-sync')
 const LOG_PATH = join(STATE_DIR, 'plugin.log')
 
 // Import-time probe: distinguishes "module never imported" from "apply never
@@ -36,9 +33,8 @@ if (DEBUG) {
     // probe only
   }
 }
-const DSH_HOME = process.env.DSH_HOME || join(HOME, '.dsh')
-const PROFILE_DIR = process.env.DSH_PROFILE_DIR || join(DSH_HOME, 'profiles', 'dsh-tui')
-const PATCH_PATH = join(PROFILE_DIR, 'cordis.patch.yml')
+/** Same file the sync writes, so the status always describes what was synced. */
+const PATCH_PATH = defaultPaths().target
 
 const FIELD_KEY = 'ccswitch'
 const REFRESH_MS = 60_000

package/lib/sync.mjs

@@ -17,21 +17,29 @@ export const END_MARK = '# <<< cc-switch sync (managed) <<<'
 
 const EMPTY_PROVIDERS_BLOCK = '- id: llm-pi-ai\n  config:\n    providers: {}\n'
 const KEEP_BACKUPS = 20
-/** Overridable so tests never touch the real state directory. */
-const STATE_DIR = process.env.CCSWITCH_SYNC_STATE || join(homedir(), '.dsh-tui')
+const STABLE_READ_DELAY_MS = 150
+const STABLE_READ_ATTEMPTS = 5
+/** Plugin state (backups, log). The env override keeps tests off the real directory. */
+export const STATE_DIR = join(process.env.CCSWITCH_SYNC_STATE || join(homedir(), '.dsh-tui'), 'ccswitch-sync')
 
 export function defaultPaths() {
   const home = process.env.DSH_HOME || join(homedir(), '.dsh')
   const profiles = join(home, 'profiles')
+  const targetDir = process.env.DSH_PROFILE_DIR || join(profiles, 'dsh-tui')
   return {
     sources: [
       join(profiles, 'web', 'cordis.patch.yml'),
       join(profiles, 'desktop', 'cordis.patch.yml'),
     ],
-    target: join(profiles, 'dsh-tui', 'cordis.patch.yml'),
+    target: join(targetDir, 'cordis.patch.yml'),
   }
 }
 
+/** A leading BOM would hide the first "- " entry from blockSpans. */
+function stripBom(text) {
+  return text.startsWith('\uFEFF') ? text.slice(1) : text
+}
+
 function linesWithEnds(text) {
   const out = []
   let index = 0
@@ -77,7 +85,8 @@ export function isManagedInsert(block) {
 }
 
 /** The blocks to mirror, always with an `llm-pi-ai` entry. */
-export function extractManaged(sourceText) {
+export function extractManaged(rawSourceText) {
+  const sourceText = stripBom(rawSourceText)
   const blocks = blockSpans(sourceText).map(({ start, end }) => sourceText.slice(start, end))
   const wanted = blocks.filter((block) => isLlmPiAiBlock(block) || isManagedInsert(block))
   if (!wanted.some(isLlmPiAiBlock)) wanted.unshift(EMPTY_PROVIDERS_BLOCK)
@@ -87,7 +96,6 @@ export function extractManaged(sourceText) {
 function dropBlocks(text, predicate) {
   const spans = blockSpans(text)
     .filter(({ start, end }) => predicate(text.slice(start, end)))
-    .map(({ start, end }) => ({ start, end }))
   let result = text
   for (let i = spans.length - 1; i >= 0; i -= 1) {
     result = result.slice(0, spans[i].start) + result.slice(spans[i].end)
@@ -112,7 +120,8 @@ function dropEmptyFlowSequence(text) {
 }
 
 /** Splice the managed block into the target patch text. */
-export function composePatch(targetText, managedBlocks) {
+export function composePatch(rawTargetText, managedBlocks) {
+  const targetText = stripBom(rawTargetText)
   const managed = `${BEGIN_MARK}\n${managedBlocks.join('')}${END_MARK}\n`
   let head = targetText
   let tail = ''
@@ -131,12 +140,21 @@ export function composePatch(targetText, managedBlocks) {
   return out
 }
 
+/**
+ * Read until two consecutive reads agree, so a file another process is still
+ * writing is not mirrored half-written. Gives up after a few attempts and
+ * returns the latest read.
+ */
 async function readStable(path) {
   try {
-    const first = await readFile(path, 'utf8')
-    await new Promise((resolve) => setTimeout(resolve, 150))
-    const second = await readFile(path, 'utf8')
-    return second === first ? first : second
+    let previous = await readFile(path, 'utf8')
+    for (let attempt = 1; attempt < STABLE_READ_ATTEMPTS; attempt += 1) {
+      await new Promise((resolve) => setTimeout(resolve, STABLE_READ_DELAY_MS))
+      const current = await readFile(path, 'utf8')
+      if (current === previous) return current
+      previous = current
+    }
+    return previous
   } catch (error) {
     if (error && error.code === 'ENOENT') return undefined
     throw error
@@ -150,7 +168,7 @@ async function backupTarget(target) {
       .replace(/[-:]/g, '')
       .replace('T', '-')
       .slice(0, 15)
-    const dir = join(STATE_DIR, 'ccswitch-sync', 'backups')
+    const dir = join(STATE_DIR, 'backups')
     await mkdir(dir, { recursive: true })
     const dest = join(dir, `cordis.patch.${stamp}.yml`)
     await copyFile(target, dest)
@@ -164,7 +182,7 @@ async function backupTarget(target) {
 }
 
 /**
- * Mirror the newest readable source into the target.
+ * Mirror the first existing source (web, then desktop) into the target.
  * @returns `{ changed, note }` — `changed` is true only when bytes were written.
  */
 export async function syncOnce(paths = defaultPaths()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ccswitch-sync",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Mirror CC Switch's DSH providers and MCP servers into the dsh-tui profile, and show how fresh the mirror is.",
   "keywords": [
     "dsh",
@@ -42,7 +42,7 @@
   "scripts": {
     "check": "node --check lib/index.js && node --check lib/sync.mjs",
     "check:manifest": "node scripts/check-manifest.mjs",
-    "test": "node --test test/sync.test.mjs"
+    "test": "node --test \"test/*.test.mjs\""
   },
   "dsh": {
     "bundle": {