acmer-coach 2.3.0 → 2.3.1

package/README.md

@@ -108,7 +108,10 @@ learned/verified 记录，或路线中在此前安排的必验训练，不能从
 把 AC、WA/TLE/RE 和比赛分钟画在同一条时间轴上。
 
 每个 VP 账号都放在 `~/.dsh/knowledge/vp-accounts/<user_id>/`，token 单独保存，
-同步游标、原始安全投影和回放缓存都按账号分开。切换账号会切换教练工作区；服务端
+同步游标、原始安全投影、回放缓存和 `VP_EVENTS.yaml` 都按账号分开。个人训练数据
+`PROGRESS.yaml`、`CURRICULUM.yaml`、`SCHEDULE.yaml`、`TARGET.yaml` 始终留在
+`~/.dsh/knowledge/`，切换 VP 账号不会换教练。2.3.1 会把旧版本误写进账号目录的个人文件按更新时间迁回；被替换的主目录文件会留下 `.pre-vp-account-<user_id>` 备份，原账号文件不删除。
+服务端
 返回的账号 id 与当前账号不一致时，客户端拒绝写入。同步和回放都不返回提交代码或 judge 输出。
 `disconnect` 只删除本地 token，保留缓存，方便重新连接同一个账号。
 

package/dev/strategy-check.mjs

@@ -147,6 +147,31 @@ test('invalid target priorities are rejected instead of silently dropped', () =>
   } finally { rmSync(dir, { recursive: true, force: true }) }
 })
 
+test('personal target stays shared while VP events stay account-scoped', () => {
+  const personal = mkdtempSync(join(tmpdir(), 'acmer-coach-personal-'))
+  const accountA = mkdtempSync(join(tmpdir(), 'acmer-coach-vp-a-'))
+  const accountB = mkdtempSync(join(tmpdir(), 'acmer-coach-vp-b-'))
+  const options = {
+    competenciesPath: join(process.cwd(), 'assets', 'knowledge', 'COMPETENCIES.yaml'),
+  }
+  try {
+    const a = createStrategyStore({ ...options, dataDir: personal, vpDir: accountA })
+    const b = createStrategyStore({ ...options, dataDir: personal, vpDir: accountB })
+    const target = { expectedRevision: 0, contest: '西安区域赛', date: '2026-10-17', result: '保铜争银', weeklyHours: 25,
+      priorities: [{ id: 'implementation-stability', weight: 100 }] }
+    assert.equal(a.target('set', target).ok, true)
+    assert.equal(a.vpImport([{ eventId: 'account-a', contest: 'VP A', date: '2026-10-10', durationMinutes: 300,
+      problems: [{ problemId: 'A', status: 'AC' }] }]).ok, true)
+    assert.equal(b.target('read').contest, '西安区域赛')
+    assert.equal(b.vpImport([]).total, 0)
+    assert.equal(existsSync(join(personal, 'TARGET.yaml')), true)
+    assert.equal(existsSync(join(accountA, 'VP_EVENTS.yaml')), true)
+    assert.equal(existsSync(join(accountB, 'VP_EVENTS.yaml')), false)
+  } finally {
+    for (const dir of [personal, accountA, accountB]) rmSync(dir, { recursive: true, force: true })
+  }
+})
+
 test('corrupt stored strategy data returns a structured refusal', () => {
   const { dir, store } = fixture()
   try {

package/dev/workspace-migration-check.mjs

@@ -0,0 +1,34 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+
+test('startup migrates legacy personal files out of an active VP account', async () => {
+  const root = mkdtempSync(join(tmpdir(), 'acmer-coach-workspace-'))
+  const accountDir = join(root, 'vp-accounts', '6')
+  mkdirSync(accountDir, { recursive: true })
+  writeFileSync(join(root, 'VP_ACCOUNTS.json'), JSON.stringify({
+    version: 1,
+    activeAccountId: 6,
+    accounts: { 6: { account: { id: 6, handle: 'Mianiii', display_name: 'Mianiii' }, baseUrl: 'https://example.test' } },
+  }))
+  writeFileSync(join(root, 'TARGET.yaml'), 'version: 1\nrevision: 1\nupdated: 2026-10-10T20:55:57.385Z\ncontest: 旧目标\ndate: 2026-10-17\nresult: 保铜争银\nteamMode: team\nweeklyHours: 25\nconstraints: {}\npriorities: []\n')
+  writeFileSync(join(accountDir, 'TARGET.yaml'), 'version: 1\nrevision: 1\nupdated: 2026-10-11T00:51:42.901Z\ncontest: 西安区域赛\ndate: 2026-10-17\nresult: 保铜争银\nteamMode: team\nweeklyHours: 25\nconstraints: {}\npriorities: []\n')
+  const oldTargetTime = new Date('2026-10-10T20:55:57.385Z')
+  const newTargetTime = new Date('2026-10-11T00:51:42.901Z')
+  const { utimesSync } = await import('node:fs')
+  utimesSync(join(root, 'TARGET.yaml'), oldTargetTime, oldTargetTime)
+  utimesSync(join(accountDir, 'TARGET.yaml'), newTargetTime, newTargetTime)
+  process.env.COACH_DATA_DIR = root
+  try {
+    await import(`../index.js?workspace-migration=${Date.now()}`)
+    assert.equal(existsSync(join(root, 'TARGET.yaml')), true)
+    assert.equal(existsSync(join(accountDir, 'TARGET.yaml')), true)
+    assert.equal(existsSync(join(root, 'TARGET.yaml.pre-vp-account-6')), true)
+    assert.match((await import('node:fs')).readFileSync(join(root, 'TARGET.yaml'), 'utf8'), /contest: 西安区域赛/)
+  } finally {
+    delete process.env.COACH_DATA_DIR
+    rmSync(root, { recursive: true, force: true })
+  }
+})

package/dev.sh

@@ -35,7 +35,7 @@ done
 # 从副本目录跑 `bash dev.sh` 走的是另一条路（`dsh plugin remove/add`，而那条
 # 路不可靠），和这份的行为不一样。换句话说，**同一个命令，从哪个目录按回车
 # 决定跑哪份脚本** —— 两份 dev.sh 就是两份真相，正是这份文件在防的那种坑。
-SYNC_FILES='index.js package.json verify.mjs verify-shape.mjs progress-cli.mjs build-node-meta.mjs cordis.patch.yml README.md lib/client.js lib/vp-client.js lib/setup.js lib/curriculum.js lib/curriculum-evidence.js lib/curriculum-planning.js lib/strategy.js assets/knowledge/COMPETENCIES.yaml assets/knowledge/vp.html assets/rules/coach-rules.md dev/curriculum-check.mjs dev/curriculum-evidence-check.mjs dev/strategy-check.mjs dev/vp-client-check.mjs docs/长期课程机制.md dev.sh'
+SYNC_FILES='index.js package.json verify.mjs verify-shape.mjs progress-cli.mjs build-node-meta.mjs cordis.patch.yml README.md lib/client.js lib/vp-client.js lib/setup.js lib/curriculum.js lib/curriculum-evidence.js lib/curriculum-planning.js lib/strategy.js assets/knowledge/COMPETENCIES.yaml assets/knowledge/vp.html assets/rules/coach-rules.md dev/curriculum-check.mjs dev/curriculum-evidence-check.mjs dev/strategy-check.mjs dev/workspace-migration-check.mjs dev/vp-client-check.mjs docs/长期课程机制.md dev.sh'
 STALE=''
 for f in $SYNC_FILES; do
   for d in "${DSTS[@]}"; do

package/index.js

@@ -23,7 +23,7 @@
 //   · `file:` 依赖装出来的是**硬链接**，不是拷贝。原地写两边同变，但改名式
 //     写入（Edit 工具、VS Code 原子保存）会**断开链接**，断了两边分家，
 //     而 `dsh plugin add` 认不出分家、不重链也不报错 —— 所以改完一律跑 dev.sh。
-import { copyFileSync, mkdirSync, readFileSync, unlinkSync, writeFileSync, renameSync, statSync } from 'node:fs'
+import { copyFileSync, mkdirSync, readFileSync, unlinkSync, writeFileSync, renameSync, statSync, existsSync } from 'node:fs'
 import { join } from 'node:path'
 import { homedir } from 'node:os'
 import { parse, stringify } from 'yaml'
@@ -36,7 +36,7 @@ import { createVpClient } from './lib/vp-client.js'
 const name = 'acmer-coach'
 const inject = ['tools']
 
-const VERSION = '2.2.0'
+const VERSION = '2.3.1'
 
 // 块结构（方针 §4.1.1）：40 自己做 + 10 解决遗留 + 10 重写 = 60 分钟。
 // 这是**一个题目循环**的固定形状。时间不够该换更小的题，不是把块压扁。
@@ -72,30 +72,66 @@ const TEACH_FLOOR_MIN = 10
 const DATA_DIR_EXPLICIT = Boolean(process.env.COACH_DATA_DIR)
 const DATA_DIR = process.env.COACH_DATA_DIR || join(homedir(), '.dsh', 'knowledge')
 const MAP_PATH = () => join(DATA_DIR, 'MAP.yaml')
-let ACTIVE_DATA_DIR = DATA_DIR
+let ACTIVE_VP_DIR = DATA_DIR
 let strategy
 let curriculum
-function createStores(dataDir) {
+function createStores(vpDir) {
   strategy = createStrategyStore({
-    dataDir, competenciesPath: join(import.meta.dirname, 'assets', 'knowledge', 'COMPETENCIES.yaml'),
+    dataDir: DATA_DIR, vpDir,
+    competenciesPath: join(import.meta.dirname, 'assets', 'knowledge', 'COMPETENCIES.yaml'),
   })
   curriculum = createCurriculumStore({
-    dataDir, loadMap, loadProgress, loadSchedule,
+    dataDir: DATA_DIR, loadMap, loadProgress, loadSchedule,
     loadStrategyEvidence: () => strategy.evidence().evidence,
   })
 }
-createStores(ACTIVE_DATA_DIR)
+createStores(ACTIVE_VP_DIR)
+
+const PERSONAL_FILES = ['PROGRESS.yaml', 'CURRICULUM.yaml', 'SCHEDULE.yaml', 'TARGET.yaml']
+
+// 2.3.0 曾把个人文件误写进 VP 账号目录。迁移时按 mtime 取较新的一份；
+// 被替换的主目录文件留备份，原账号目录也保留，方便人工核对和恢复。
+function migratePersonalWorkspace(accountId) {
+  if (!accountId) return []
+  const sourceDir = join(DATA_DIR, 'vp-accounts', String(accountId))
+  if (!existsSync(sourceDir)) return []
+  const migrated = []
+  for (const file of PERSONAL_FILES) {
+    const from = join(sourceDir, file)
+    const to = join(DATA_DIR, file)
+    if (!existsSync(from)) continue
+    if (!existsSync(to)) {
+      copyFileSync(from, to)
+      migrated.push(file)
+      continue
+    }
+    const sourceStat = statSync(from)
+    const targetStat = statSync(to)
+    if (sourceStat.mtimeMs <= targetStat.mtimeMs) continue
+    const sourceBody = readFileSync(from)
+    const targetBody = readFileSync(to)
+    if (sourceBody.equals(targetBody)) continue
+    const backup = `${to}.pre-vp-account-${String(accountId)}`
+    if (!existsSync(backup)) copyFileSync(to, backup)
+    copyFileSync(from, to)
+    migrated.push(`${file}（更新）`)
+  }
+  return migrated
+}
 
 function switchCoachWorkspace(accountId = '') {
-  ACTIVE_DATA_DIR = accountId ? join(DATA_DIR, 'vp-accounts', String(accountId)) : DATA_DIR
-  mkdirSync(ACTIVE_DATA_DIR, { recursive: true })
-  createStores(ACTIVE_DATA_DIR)
-  return ACTIVE_DATA_DIR
+  ACTIVE_VP_DIR = accountId ? join(DATA_DIR, 'vp-accounts', String(accountId)) : DATA_DIR
+  mkdirSync(ACTIVE_VP_DIR, { recursive: true })
+  createStores(ACTIVE_VP_DIR)
+  return ACTIVE_VP_DIR
 }
 
 const vpClient = createVpClient({ dataDir: DATA_DIR })
 const savedVp = vpClient.localStatus()
-if (savedVp.connected) switchCoachWorkspace(savedVp.activeAccountId)
+if (savedVp.connected) {
+  migratePersonalWorkspace(savedVp.activeAccountId)
+  switchCoachWorkspace(savedVp.activeAccountId)
+}
 
 // 探针要的文件，各自代表一条后面的依赖：
 //   MAP.yaml      地图（coach_next 读它算候选）
@@ -187,7 +223,7 @@ function loadMap() {
 //
 // 游标显式存，不靠"已验证的最大深度"推 —— 推出来的东西没法手改，
 // 而且他想复习某节时游标要能停在那儿。
-const PROGRESS_PATH = () => join(ACTIVE_DATA_DIR, 'PROGRESS.yaml')
+const PROGRESS_PATH = () => join(DATA_DIR, 'PROGRESS.yaml')
 
 function emptyProgress() {
   return { version: 1, cursor: '', updated: '', nodes: {}, pending: null }
@@ -326,7 +362,7 @@ function saveProgress(p) {
 //
 // `actual` 是**校准真实做题速度**的唯一来源 —— 计划 60 分钟实际 95 分钟，
 // 攒几周才知道他的速度到底是多少。这条现在一条数据都没有，所以排程只能保守。
-const SCHEDULE_PATH = () => join(ACTIVE_DATA_DIR, 'SCHEDULE.yaml')
+const SCHEDULE_PATH = () => join(DATA_DIR, 'SCHEDULE.yaml')
 
 function emptySchedule() {
   return { version: 1, updated: '', days: {} }
@@ -1539,7 +1575,11 @@ function registerPages(ctx) {
       try {
         let result
         if (payload.op === 'start') result = await vpClient.start({ baseUrl: payload.baseUrl })
-        else if (payload.op === 'finish') { result = await vpClient.finish({ code: payload.code, baseUrl: payload.baseUrl }); switchCoachWorkspace(result.activeAccountId) }
+        else if (payload.op === 'finish') {
+          result = await vpClient.finish({ code: payload.code, baseUrl: payload.baseUrl })
+          migratePersonalWorkspace(result.activeAccountId)
+          switchCoachWorkspace(result.activeAccountId)
+        }
         else if (payload.op === 'disconnect') { result = vpClient.disconnect(); switchCoachWorkspace('') }
         else if (payload.op === 'sync') result = await vpClient.sync({})
         else return sendJson(res, 400, { ok: false, reject: 'op 只能是 start/finish/disconnect/sync' })
@@ -1953,6 +1993,7 @@ function apply(ctx) {
         if (action === 'start') result = await vpClient.start({ baseUrl: base })
         else if (action === 'finish') {
           result = await vpClient.finish({ code: args?.code, baseUrl: base })
+          migratePersonalWorkspace(result.activeAccountId)
           switchCoachWorkspace(result.activeAccountId)
         } else if (action === 'disconnect') {
           result = vpClient.disconnect()

package/lib/strategy.js

@@ -105,9 +105,9 @@ function normalizePostmortem(value) {
   }
 }
 
-export function createStrategyStore({ dataDir, competenciesPath, now = () => new Date() }) {
+export function createStrategyStore({ dataDir, vpDir = dataDir, competenciesPath, now = () => new Date() }) {
   const targetPath = join(dataDir, 'TARGET.yaml')
-  const vpPath = join(dataDir, 'VP_EVENTS.yaml')
+  const vpPath = join(vpDir, 'VP_EVENTS.yaml')
   const validateTarget = (doc) => {
     const errors = []
     if (doc.version !== 1) errors.push('version 必须是 1')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "acmer-coach",
   "description": "小鲸教练插件：把「位置 + 判断」从小鲸的转述里拿回来。读 MAP/DEPENDS/PROGRESS，给唯一动作、判因、检测。热插拔，删掉即还原。",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Miantiao1231/acmer-coach.git"