新增: 待发箱/唤醒原语/预算随窗口 + 治理门禁与场景护栏
- 待发箱地基: V51 ai_outbox 表 + 手写 OutboxRepo(claim CAS/崩溃残留复位/瞬时失败保留) + outbox.rs 调度器(KV 默认关/Notify 唤醒/会话忙跳过不丢)
- Wake 异步唤醒原语: 三条件(delay/file-appear/process-exit)+纯判定+注入走正典 spawn_agentic_session,默认关
- 上下文预算随模型窗口: model_context.rs 三级优先(池显式>预设表>回退 128K);上界取 1M 而非 128K——max_tokens 仅裁剪预算,卡 128K 等于不治根因
- 文件租约补纯函数与单测(未另造双轨:LEASE 早随 cb260ab 落地) / 跨会话召回补纯函数单测(主体早已落地)
- 子代理: 完整卡已消化 + 子会话压缩层 + P3 批量
- 隧道/中继: 指令离线不丢 + Hello proto 版本 + 心跳与 runbook
- df-mcp: 写工具后落 KV 变更标记(供 GUI 轮询兜底,补独立 stdio 进程无感知)
- 迁移链顶点改单一真值常量 LATEST_SCHEMA_VERSION(修 2 处因 V51 失效的断言)
- 治理: i18n 特殊字符提交门禁(含反引号覆盖 + 10 自测) / 根目录卫生门禁 / 看板归档器 / 单一 lockfile(bun) / swap-install 落 temp/ 且兼容无 Get-FileHash
- 场景护栏: 流式正文可见性 e2e(playwright 免真机事件回放) + 列表续写/外置句柄 node 测试
This commit is contained in:
+80
-35
@@ -8,59 +8,104 @@
|
||||
// 修法:字面量用 vue-i18n 的插值转义,如 `{'@'}`(渲染仍显示 @)。
|
||||
//
|
||||
// 依赖 @intlify/message-compiler(vue-i18n 的编译器);解析不到时只告警不拦截(避免门禁误伤)。
|
||||
//
|
||||
// 扫描/编译逻辑抽为可导出函数(scanText / scanDirectory / compileMessage),供
|
||||
// scripts/check-i18n.test.cjs 自测;CLI 入口行为保持不变。
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
let baseCompile;
|
||||
let baseCompile = null;
|
||||
try {
|
||||
({ baseCompile } = require('@intlify/message-compiler'));
|
||||
} catch {
|
||||
console.warn('[i18n-check] 未找到 @intlify/message-compiler,跳过消息编译预检(需 npm 依赖)');
|
||||
process.exit(0);
|
||||
baseCompile = null;
|
||||
}
|
||||
|
||||
const DIRS = ['src/i18n/zh-CN', 'src/i18n/en'];
|
||||
// key: 'value' / key: "value"(带转义),仅取字符串字面量值
|
||||
const KV_RE = /(?:^|[\s,{])([A-Za-z0-9_$]+)\s*:\s*(['"])((?:\\.|(?!\2).)*)\2/gm;
|
||||
// key: 'value' / "value" / `value`(带转义),三种字面量都取——
|
||||
// 反引号模板字面量同样可能含未转义 @/|/裸{},原先只匹配引号 → 门禁假阴性(2026-10-10 对抗审查发现)。
|
||||
const KV_RE = /(?:^|[\s,{])([A-Za-z0-9_$]+)\s*:\s*([`'"])((?:\\.|(?!\2).)*)\2/gm;
|
||||
|
||||
let checked = 0;
|
||||
let failed = 0;
|
||||
for (const dir of DIRS) {
|
||||
// 编译单个消息值,返回错误数组(@intlify 风格:{ message })
|
||||
function compileMessage(val) {
|
||||
const errs = [];
|
||||
try {
|
||||
baseCompile(val, { onError: (e) => errs.push(e), onWarn: () => {} });
|
||||
} catch (e) {
|
||||
errs.push(e);
|
||||
}
|
||||
return errs;
|
||||
}
|
||||
|
||||
// 扫描一段源码文本,返回 { checked, violations }
|
||||
// - checked: 含 vue-i18n 特殊字符(@ { |)并已送编译的值个数
|
||||
// - violations: 编译报错的条目 [{ key, value, message }]
|
||||
function scanText(txt) {
|
||||
const violations = [];
|
||||
let checked = 0;
|
||||
KV_RE.lastIndex = 0;
|
||||
let m;
|
||||
while ((m = KV_RE.exec(txt))) {
|
||||
const key = m[1];
|
||||
// 模板字面量里的 ${...} 插值对 vue-i18n 无意义,编译前替换为占位符避免假报错
|
||||
const val = m[2] === '`' ? m[3].replace(/\$\{[^}]*\}/g, 'X') : m[3];
|
||||
// 只编译含 vue-i18n 特殊字符的值(@ { |),其余不可能因语法报错
|
||||
if (!/[@{|]/.test(val)) continue;
|
||||
checked++;
|
||||
const errs = compileMessage(val);
|
||||
if (errs.length) violations.push({ key, value: val, message: errs[0].message });
|
||||
}
|
||||
return { checked, violations };
|
||||
}
|
||||
|
||||
// 扫描目录下所有 .ts,返回 { checked, violations }(violations 带 file 字段)
|
||||
function scanDirectory(dir) {
|
||||
const violations = [];
|
||||
let checked = 0;
|
||||
let files;
|
||||
try {
|
||||
files = fs.readdirSync(dir);
|
||||
} catch {
|
||||
continue;
|
||||
return { checked, violations };
|
||||
}
|
||||
for (const f of files) {
|
||||
if (!f.endsWith('.ts')) continue;
|
||||
const txt = fs.readFileSync(path.join(dir, f), 'utf8');
|
||||
KV_RE.lastIndex = 0;
|
||||
let m;
|
||||
while ((m = KV_RE.exec(txt))) {
|
||||
const key = m[1];
|
||||
const val = m[3];
|
||||
// 只编译含 vue-i18n 特殊字符的值(@ { |),其余不可能因语法报错
|
||||
if (!/[@{|]/.test(val)) continue;
|
||||
checked++;
|
||||
const errs = [];
|
||||
try {
|
||||
baseCompile(val, { onError: (e) => errs.push(e), onWarn: () => {} });
|
||||
} catch (e) {
|
||||
errs.push(e);
|
||||
}
|
||||
if (errs.length) {
|
||||
failed++;
|
||||
console.error(`✗ ${dir}/${f} :: ${key} => ${errs[0].message}`);
|
||||
console.error(` 值: ${JSON.stringify(val)}`);
|
||||
console.error(` 提示: 字面 @ 须转义为 {'@'}(同理 | 与裸 {})`);
|
||||
}
|
||||
}
|
||||
const res = scanText(fs.readFileSync(path.join(dir, f), 'utf8'));
|
||||
checked += res.checked;
|
||||
for (const v of res.violations) violations.push({ file: f, ...v });
|
||||
}
|
||||
return { checked, violations };
|
||||
}
|
||||
|
||||
if (failed > 0) {
|
||||
console.error(`[i18n-check] 失败 ${failed} 处(共编译 ${checked} 个含特殊字符的值)——prod 运行时会抛 Invalid linked format`);
|
||||
process.exit(1);
|
||||
// CLI 主流程:返回进程退出码(0 通过 / 1 失败)
|
||||
function run() {
|
||||
if (!baseCompile) {
|
||||
console.warn('[i18n-check] 未找到 @intlify/message-compiler,跳过消息编译预检(需 npm 依赖)');
|
||||
return 0;
|
||||
}
|
||||
let checked = 0;
|
||||
let failed = 0;
|
||||
for (const dir of DIRS) {
|
||||
const res = scanDirectory(dir);
|
||||
checked += res.checked;
|
||||
for (const v of res.violations) {
|
||||
failed++;
|
||||
console.error(`✗ ${dir}/${v.file} :: ${v.key} => ${v.message}`);
|
||||
console.error(` 值: ${JSON.stringify(v.value)}`);
|
||||
console.error(` 提示: 字面 @ 须转义为 {'@'}(同理 | 与裸 {})`);
|
||||
}
|
||||
}
|
||||
|
||||
if (failed > 0) {
|
||||
console.error(`[i18n-check] 失败 ${failed} 处(共编译 ${checked} 个含特殊字符的值)——prod 运行时会抛 Invalid linked format`);
|
||||
return 1;
|
||||
}
|
||||
console.log(`[i18n-check] 通过(编译 ${checked} 个含特殊字符的值,0 失败)`);
|
||||
return 0;
|
||||
}
|
||||
console.log(`[i18n-check] 通过(编译 ${checked} 个含特殊字符的值,0 失败)`);
|
||||
|
||||
if (require.main === module) {
|
||||
process.exit(run());
|
||||
}
|
||||
|
||||
module.exports = { compileMessage, scanText, scanDirectory, run, KV_RE, DIRS };
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
// check-i18n.cjs 的门禁自测:用 node 内置测试跑,不引第三方依赖。
|
||||
// node --test scripts/check-i18n.test.cjs
|
||||
//
|
||||
// 覆盖(对应 2026-10-10 对抗审查发现的假阴性 + 常规门禁行为):
|
||||
// ① 单引号值含裸 @ → 报错
|
||||
// ② 双引号值含裸 @ → 报错
|
||||
// ③ 反引号模板字面量含裸 @ → 报错(原实现只匹配引号,漏报)
|
||||
// ④ 含 ${} 插值不误报(模板字面量里的插值需先占位再编译)
|
||||
// ⑤ 转义写法 {'@'} → 通过
|
||||
// ⑥ 含 | 与裸 {} 的用例
|
||||
// 另附 scanDirectory 对临时目录样本的端到端断言。
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert');
|
||||
const fs = require('node:fs');
|
||||
const os = require('node:os');
|
||||
const path = require('node:path');
|
||||
const { scanText, scanDirectory } = require('./check-i18n.cjs');
|
||||
|
||||
let compilerAvailable = true;
|
||||
try {
|
||||
require('@intlify/message-compiler');
|
||||
} catch {
|
||||
compilerAvailable = false;
|
||||
}
|
||||
const opts = compilerAvailable ? {} : { skip: '@intlify/message-compiler 不可用,跳过编译相关用例' };
|
||||
|
||||
// 构造一份 TS 源样本:每行一个 `key: '<literal>',`
|
||||
const src = (...lines) => `export default {\n${lines.map((l) => ` ${l},`).join('\n')}\n}\n`;
|
||||
|
||||
test('①单引号值含裸 @ → 报错', opts, () => {
|
||||
const r = scanText(src("a: 'hello @ world'"));
|
||||
assert.equal(r.checked, 1);
|
||||
assert.equal(r.violations.length, 1);
|
||||
assert.equal(r.violations[0].key, 'a');
|
||||
});
|
||||
|
||||
test('②双引号值含裸 @ → 报错', opts, () => {
|
||||
const r = scanText(src('b: "hello @ world"'));
|
||||
assert.equal(r.checked, 1);
|
||||
assert.equal(r.violations.length, 1);
|
||||
assert.equal(r.violations[0].key, 'b');
|
||||
});
|
||||
|
||||
test('③反引号模板字面量含裸 @ → 报错(假阴性回归)', opts, () => {
|
||||
const r = scanText(src('c: `hello @ world`'));
|
||||
assert.equal(r.checked, 1);
|
||||
assert.equal(r.violations.length, 1);
|
||||
assert.equal(r.violations[0].key, 'c');
|
||||
});
|
||||
|
||||
test('④-1 模板字面量含 ${} 插值(无特殊字符)不误报', opts, () => {
|
||||
const r = scanText(src('d: `hello ${name}`'));
|
||||
// 插值被占位后不含 @ { |,不计入 checked,也无违规
|
||||
assert.equal(r.violations.length, 0);
|
||||
});
|
||||
|
||||
test('④-2 插值位于花括号内不误报(占位替代的关键场景)', opts, () => {
|
||||
// 原值 `total {${count}}` 直接编译会报 Invalid token in placeholder: '$',
|
||||
// 必须先替换 ${...} 为占位符成为 `total {X}`(合法具名插值)才不误报。
|
||||
const r = scanText(src('e: `total {${count}}`'));
|
||||
assert.equal(r.violations.length, 0);
|
||||
assert.equal(r.checked, 1);
|
||||
});
|
||||
|
||||
test('⑤转义写法 {\'@\'} → 通过', opts, () => {
|
||||
const r = scanText(src("f: \"{'@'}\""));
|
||||
assert.equal(r.checked, 1);
|
||||
assert.equal(r.violations.length, 0);
|
||||
});
|
||||
|
||||
test('⑥-1 值含 | 会进入编译且正常通过', opts, () => {
|
||||
const r = scanText(src("g: 'one | two'"));
|
||||
assert.equal(r.checked, 1);
|
||||
assert.equal(r.violations.length, 0);
|
||||
});
|
||||
|
||||
test('⑥-2 值以 | 结尾(plural 缺省) → 报错', opts, () => {
|
||||
const r = scanText(src("h: 'one |'"));
|
||||
assert.equal(r.checked, 1);
|
||||
assert.equal(r.violations.length, 1);
|
||||
});
|
||||
|
||||
test('⑥-3 裸 { 未闭合 → 报错', opts, () => {
|
||||
const r = scanText(src("i: 'x { y'"));
|
||||
assert.equal(r.checked, 1);
|
||||
assert.equal(r.violations.length, 1);
|
||||
});
|
||||
|
||||
test('scanDirectory 扫临时目录样本:定位到违规文件', opts, () => {
|
||||
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'i18n-check-'));
|
||||
try {
|
||||
fs.writeFileSync(path.join(dir, 'ok.ts'), src("ok: 'plain text'"));
|
||||
fs.writeFileSync(path.join(dir, 'bad.ts'), src('bad: `oops @ here`'));
|
||||
const r = scanDirectory(dir);
|
||||
assert.equal(r.violations.length, 1);
|
||||
assert.equal(r.violations[0].file, 'bad.ts');
|
||||
assert.equal(r.violations[0].key, 'bad');
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,14 @@
|
||||
#!/bin/sh
|
||||
# 根目录卫生门禁(2026-10-10 根治):根目录只放项目元文件,**新增**根文件不在白名单即拒。
|
||||
# 背景:日志/一次性脚本/临时产物反复堆到仓库根,已两次人工清理(2026-10-10)——治本靠门禁而非再清一遍。
|
||||
# 约定:日志与临时产物入 temp/(已 gitignore);脚本入 scripts/;文档入 docs/。
|
||||
added=$(git diff --cached --name-only --diff-filter=A)
|
||||
[ -z "$added" ] && exit 0
|
||||
bad=$(printf '%s\n' "$added" | awk -F/ 'NF==1' | grep -vE '^(ARCHITECTURE\.md|CLAUDE\.md|README\.md|Cargo\.toml|Cargo\.lock|bun\.lock|index\.html|package\.json|playwright\.config\.ts|tsconfig\.json|tsconfig\.node\.json|vite\.config\.ts|\.gitignore|\.gitattributes|\.dockerignore)$')
|
||||
if [ -n "$bad" ]; then
|
||||
echo "✗ [根目录卫生] 新增根文件不在白名单: $(printf '%s ' $bad)"
|
||||
echo " 路径约定:日志/临时产物→temp/(已 gitignore);脚本→scripts/;文档→docs/;确属项目元文件才放根"
|
||||
echo " 如确需新增根文件,请同步更新本规则白名单(scripts/hooks/rules/root-hygiene.sh)"
|
||||
exit 1
|
||||
fi
|
||||
exit 0
|
||||
@@ -15,8 +15,8 @@ if (-not $installer) {
|
||||
}
|
||||
$target = 'C:\Users\23780\AppData\Local\devflow\devflow.exe'
|
||||
$builtExe = 'E:\wk-lab\devflow\target\release\devflow.exe'
|
||||
$log = 'E:\wk-lab\devflow\swap-install.log'
|
||||
$lockFile = 'E:\wk-lab\devflow\swap-install.lock'
|
||||
$log = 'E:\wk-lab\devflow\temp\swap-install.log'
|
||||
$lockFile = 'E:\wk-lab\devflow\temp\swap-install.lock'
|
||||
|
||||
# SHA256 取值:Get-FileHash 在部分环境的本机 Windows PowerShell 5.1 上不可用(实测 2026-10-10 缺失),
|
||||
# 兜底走系统自带的 certutil。返回大写十六进制串。
|
||||
@@ -189,7 +189,7 @@ try {
|
||||
}
|
||||
|
||||
# 仍无进程, 落标记等人工拉起
|
||||
Set-Content -Path 'E:\wk-lab\devflow\swap-need-start.flag' -Value (Get-Date -Format o)
|
||||
Set-Content -Path 'E:\wk-lab\devflow\temp\swap-need-start.flag' -Value (Get-Date -Format o)
|
||||
"[$(Get-Date -Format 'HH:mm:ss')] FAIL: need manual start" | Add-Content $log
|
||||
exit 1
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user