wangchuan 2.10.0 → 2.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/wangchuan.js +9 -1
- package/dist/bin/wangchuan.js.map +1 -1
- package/dist/src/commands/doctor.d.ts +14 -0
- package/dist/src/commands/doctor.d.ts.map +1 -0
- package/dist/src/commands/doctor.js +194 -0
- package/dist/src/commands/doctor.js.map +1 -0
- package/dist/src/commands/pull.d.ts.map +1 -1
- package/dist/src/commands/pull.js +11 -1
- package/dist/src/commands/pull.js.map +1 -1
- package/dist/src/commands/push.d.ts.map +1 -1
- package/dist/src/commands/push.js +11 -0
- package/dist/src/commands/push.js.map +1 -1
- package/dist/src/commands/sync.d.ts.map +1 -1
- package/dist/src/commands/sync.js +11 -1
- package/dist/src/commands/sync.js.map +1 -1
- package/dist/src/core/sync-lock.d.ts +31 -0
- package/dist/src/core/sync-lock.d.ts.map +1 -0
- package/dist/src/core/sync-lock.js +95 -0
- package/dist/src/core/sync-lock.js.map +1 -0
- package/dist/src/i18n.d.ts.map +1 -1
- package/dist/src/i18n.js +32 -0
- package/dist/src/i18n.js.map +1 -1
- package/dist/src/utils/logger.d.ts +10 -1
- package/dist/src/utils/logger.d.ts.map +1 -1
- package/dist/src/utils/logger.js +43 -10
- package/dist/src/utils/logger.js.map +1 -1
- package/package.json +1 -1
package/dist/bin/wangchuan.js
CHANGED
|
@@ -20,6 +20,7 @@ import { cmdEnv } from '../src/commands/env.js';
|
|
|
20
20
|
import { cmdAgent } from '../src/commands/agent.js';
|
|
21
21
|
import { cmdKey } from '../src/commands/key.js';
|
|
22
22
|
import { cmdReport } from '../src/commands/report.js';
|
|
23
|
+
import { cmdDoctor } from '../src/commands/doctor.js';
|
|
23
24
|
import { logger } from '../src/utils/logger.js';
|
|
24
25
|
import { t } from '../src/i18n.js';
|
|
25
26
|
import { AGENT_NAMES } from '../src/types.js';
|
|
@@ -33,7 +34,7 @@ const program = new Command();
|
|
|
33
34
|
program
|
|
34
35
|
.name('wangchuan')
|
|
35
36
|
.description(t('cli.description'))
|
|
36
|
-
.version('2.
|
|
37
|
+
.version('2.11.0');
|
|
37
38
|
// ── init ────────────────────────────────────────────────────────
|
|
38
39
|
program
|
|
39
40
|
.command('init')
|
|
@@ -149,6 +150,13 @@ program
|
|
|
149
150
|
.action(async (opts) => {
|
|
150
151
|
await run(() => cmdReport(opts));
|
|
151
152
|
});
|
|
153
|
+
// ── doctor ──────────────────────────────────────────────────
|
|
154
|
+
program
|
|
155
|
+
.command('doctor')
|
|
156
|
+
.description(t('cli.cmd.doctor'))
|
|
157
|
+
.action(async () => {
|
|
158
|
+
await run(() => cmdDoctor());
|
|
159
|
+
});
|
|
152
160
|
// ── Error handler ───────────────────────────────────────────────
|
|
153
161
|
async function run(fn) {
|
|
154
162
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wangchuan.js","sourceRoot":"","sources":["../../bin/wangchuan.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wangchuan.js","sourceRoot":"","sources":["../../bin/wangchuan.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* doctor.ts — wangchuan doctor command
|
|
3
|
+
*
|
|
4
|
+
* Validates the entire Wangchuan setup and reports issues:
|
|
5
|
+
* - config.json exists and is valid
|
|
6
|
+
* - master.key exists with correct permissions (0o600)
|
|
7
|
+
* - git is available and repo is cloned
|
|
8
|
+
* - SSH key can access the remote repo (git ls-remote, timeout 10s)
|
|
9
|
+
* - each enabled agent's workspace directory exists
|
|
10
|
+
* - no stale sync-lock.json
|
|
11
|
+
* - integrity.json checksums match repo files
|
|
12
|
+
*/
|
|
13
|
+
export declare function cmdDoctor(): Promise<void>;
|
|
14
|
+
//# sourceMappingURL=doctor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAmJH,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAuD/C"}
|
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* doctor.ts — wangchuan doctor command
|
|
3
|
+
*
|
|
4
|
+
* Validates the entire Wangchuan setup and reports issues:
|
|
5
|
+
* - config.json exists and is valid
|
|
6
|
+
* - master.key exists with correct permissions (0o600)
|
|
7
|
+
* - git is available and repo is cloned
|
|
8
|
+
* - SSH key can access the remote repo (git ls-remote, timeout 10s)
|
|
9
|
+
* - each enabled agent's workspace directory exists
|
|
10
|
+
* - no stale sync-lock.json
|
|
11
|
+
* - integrity.json checksums match repo files
|
|
12
|
+
*/
|
|
13
|
+
import fs from 'fs';
|
|
14
|
+
import path from 'path';
|
|
15
|
+
import crypto from 'crypto';
|
|
16
|
+
import { execSync } from 'child_process';
|
|
17
|
+
import { config } from '../core/config.js';
|
|
18
|
+
import { gitEngine } from '../core/git.js';
|
|
19
|
+
import { syncLock } from '../core/sync-lock.js';
|
|
20
|
+
import { logger } from '../utils/logger.js';
|
|
21
|
+
import { t } from '../i18n.js';
|
|
22
|
+
import { AGENT_NAMES } from '../types.js';
|
|
23
|
+
import { syncEngine } from '../core/sync.js';
|
|
24
|
+
import chalk from 'chalk';
|
|
25
|
+
const PASS = (msg) => ({ status: 'pass', message: msg });
|
|
26
|
+
const WARN = (msg) => ({ status: 'warn', message: msg });
|
|
27
|
+
const FAIL = (msg) => ({ status: 'fail', message: msg });
|
|
28
|
+
const ICONS = {
|
|
29
|
+
pass: chalk.green('\u2713'),
|
|
30
|
+
warn: chalk.yellow('\u26A0'),
|
|
31
|
+
fail: chalk.red('\u2717'),
|
|
32
|
+
};
|
|
33
|
+
function checkConfig() {
|
|
34
|
+
try {
|
|
35
|
+
const cfg = config.load();
|
|
36
|
+
if (!cfg)
|
|
37
|
+
return FAIL(t('doctor.configMissing', { path: config.paths.config }));
|
|
38
|
+
return PASS(t('doctor.configOk'));
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
return FAIL(t('doctor.configInvalid', { error: err.message }));
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
function checkMasterKey() {
|
|
45
|
+
const keyPath = config.paths.key;
|
|
46
|
+
if (!fs.existsSync(keyPath)) {
|
|
47
|
+
return FAIL(t('doctor.keyMissing', { path: keyPath }));
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
const stat = fs.statSync(keyPath);
|
|
51
|
+
const mode = stat.mode & 0o777;
|
|
52
|
+
if (mode !== 0o600) {
|
|
53
|
+
return WARN(t('doctor.keyBadPerms', { path: keyPath }));
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
// On some OS (Windows) permission check may not work — treat as OK
|
|
58
|
+
}
|
|
59
|
+
return PASS(t('doctor.keyOk'));
|
|
60
|
+
}
|
|
61
|
+
async function checkGit() {
|
|
62
|
+
const available = await gitEngine.isGitAvailable();
|
|
63
|
+
return available ? PASS(t('doctor.gitOk')) : FAIL(t('doctor.gitMissing'));
|
|
64
|
+
}
|
|
65
|
+
function checkRepoCloned(localRepoPath) {
|
|
66
|
+
const repoPath = syncEngine.expandHome(localRepoPath);
|
|
67
|
+
if (fs.existsSync(path.join(repoPath, '.git'))) {
|
|
68
|
+
return PASS(t('doctor.repoOk', { path: repoPath }));
|
|
69
|
+
}
|
|
70
|
+
return FAIL(t('doctor.repoMissing', { path: repoPath }));
|
|
71
|
+
}
|
|
72
|
+
function checkRemoteAccess(repo) {
|
|
73
|
+
try {
|
|
74
|
+
execSync(`git ls-remote --exit-code "${repo}" HEAD`, {
|
|
75
|
+
timeout: 10_000,
|
|
76
|
+
stdio: 'pipe',
|
|
77
|
+
});
|
|
78
|
+
return PASS(t('doctor.sshOk'));
|
|
79
|
+
}
|
|
80
|
+
catch (err) {
|
|
81
|
+
const msg = err.message;
|
|
82
|
+
if (msg.includes('timed out') || msg.includes('TIMEOUT')) {
|
|
83
|
+
return WARN(t('doctor.sshTimeout'));
|
|
84
|
+
}
|
|
85
|
+
return WARN(t('doctor.sshFailed', { error: msg.split('\n')[0] }));
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
function checkAgentWorkspaces(cfg) {
|
|
89
|
+
const results = [];
|
|
90
|
+
const profiles = cfg.profiles.default;
|
|
91
|
+
for (const name of AGENT_NAMES) {
|
|
92
|
+
const p = profiles[name];
|
|
93
|
+
if (!p.enabled)
|
|
94
|
+
continue;
|
|
95
|
+
const wsPath = syncEngine.expandHome(p.workspacePath);
|
|
96
|
+
if (fs.existsSync(wsPath)) {
|
|
97
|
+
results.push(PASS(t('doctor.agentOk', { name, path: wsPath })));
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
results.push(WARN(t('doctor.agentMissing', { name, path: wsPath })));
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
return results;
|
|
104
|
+
}
|
|
105
|
+
function checkSyncLock() {
|
|
106
|
+
const lock = syncLock.read();
|
|
107
|
+
if (!lock)
|
|
108
|
+
return PASS(t('doctor.lockNone'));
|
|
109
|
+
try {
|
|
110
|
+
process.kill(lock.pid, 0);
|
|
111
|
+
return WARN(t('doctor.lockActive', { pid: lock.pid }));
|
|
112
|
+
}
|
|
113
|
+
catch {
|
|
114
|
+
return WARN(t('doctor.lockStale', { pid: lock.pid }));
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
function checkIntegrity(localRepoPath) {
|
|
118
|
+
const repoPath = syncEngine.expandHome(localRepoPath);
|
|
119
|
+
const manifestPath = path.join(repoPath, 'integrity.json');
|
|
120
|
+
if (!fs.existsSync(manifestPath)) {
|
|
121
|
+
return WARN(t('doctor.integrityMissing'));
|
|
122
|
+
}
|
|
123
|
+
let manifest;
|
|
124
|
+
try {
|
|
125
|
+
manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
return WARN(t('doctor.integrityMissing'));
|
|
129
|
+
}
|
|
130
|
+
const total = Object.keys(manifest.checksums).length;
|
|
131
|
+
let mismatched = 0;
|
|
132
|
+
for (const [repoRel, expectedHash] of Object.entries(manifest.checksums)) {
|
|
133
|
+
const absPath = path.join(repoPath, repoRel);
|
|
134
|
+
if (!fs.existsSync(absPath))
|
|
135
|
+
continue;
|
|
136
|
+
const content = fs.readFileSync(absPath);
|
|
137
|
+
const actualHash = crypto.createHash('sha256').update(content).digest('hex');
|
|
138
|
+
if (actualHash !== expectedHash)
|
|
139
|
+
mismatched++;
|
|
140
|
+
}
|
|
141
|
+
if (mismatched > 0) {
|
|
142
|
+
return FAIL(t('doctor.integrityFailed', { count: mismatched }));
|
|
143
|
+
}
|
|
144
|
+
return PASS(t('doctor.integrityOk', { count: total }));
|
|
145
|
+
}
|
|
146
|
+
export async function cmdDoctor() {
|
|
147
|
+
logger.banner(t('doctor.banner'));
|
|
148
|
+
const results = [];
|
|
149
|
+
// 1. Config
|
|
150
|
+
results.push(checkConfig());
|
|
151
|
+
// 2. Master key
|
|
152
|
+
results.push(checkMasterKey());
|
|
153
|
+
// 3. Git
|
|
154
|
+
results.push(await checkGit());
|
|
155
|
+
// Load config for further checks (if available)
|
|
156
|
+
let cfg = null;
|
|
157
|
+
try {
|
|
158
|
+
cfg = config.load();
|
|
159
|
+
}
|
|
160
|
+
catch { /* already reported above */ }
|
|
161
|
+
if (cfg) {
|
|
162
|
+
// 4. Repo cloned
|
|
163
|
+
results.push(checkRepoCloned(cfg.localRepoPath));
|
|
164
|
+
// 5. Remote access
|
|
165
|
+
results.push(checkRemoteAccess(cfg.repo));
|
|
166
|
+
// 6. Agent workspaces
|
|
167
|
+
results.push(...checkAgentWorkspaces(cfg));
|
|
168
|
+
// 7. Sync lock
|
|
169
|
+
results.push(checkSyncLock());
|
|
170
|
+
// 8. Integrity
|
|
171
|
+
results.push(checkIntegrity(cfg.localRepoPath));
|
|
172
|
+
}
|
|
173
|
+
// Print results
|
|
174
|
+
console.log();
|
|
175
|
+
for (const r of results) {
|
|
176
|
+
console.log(` ${ICONS[r.status]} ${r.message}`);
|
|
177
|
+
}
|
|
178
|
+
console.log();
|
|
179
|
+
// Summary
|
|
180
|
+
const pass = results.filter(r => r.status === 'pass').length;
|
|
181
|
+
const warn = results.filter(r => r.status === 'warn').length;
|
|
182
|
+
const fail = results.filter(r => r.status === 'fail').length;
|
|
183
|
+
const summary = t('doctor.summary', { pass, warn, fail });
|
|
184
|
+
if (fail > 0) {
|
|
185
|
+
logger.error(summary);
|
|
186
|
+
}
|
|
187
|
+
else if (warn > 0) {
|
|
188
|
+
logger.warn(summary);
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
logger.ok(summary);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
//# sourceMappingURL=doctor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;GAEG;AAWH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI9D,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,GAAE,WAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAiBjF"}
|
|
@@ -6,6 +6,7 @@ import { resolveGitBranch } from '../core/config.js';
|
|
|
6
6
|
import { ensureMigrated } from '../core/migrate.js';
|
|
7
7
|
import { gitEngine } from '../core/git.js';
|
|
8
8
|
import { syncEngine } from '../core/sync.js';
|
|
9
|
+
import { syncLock } from '../core/sync-lock.js';
|
|
9
10
|
import { validator } from '../utils/validator.js';
|
|
10
11
|
import { logger } from '../utils/logger.js';
|
|
11
12
|
import { t } from '../i18n.js';
|
|
@@ -19,7 +20,16 @@ export async function cmdPull({ agent } = {}) {
|
|
|
19
20
|
const repoPath = syncEngine.expandHome(cfg.localRepoPath);
|
|
20
21
|
if (agent)
|
|
21
22
|
logger.info(t('pull.filterAgent', { agent: chalk.cyan(agent) }));
|
|
22
|
-
// ──
|
|
23
|
+
// ── Acquire sync lock ─────────────────────────────────────────
|
|
24
|
+
await syncLock.acquire(repoPath);
|
|
25
|
+
try {
|
|
26
|
+
return await runPull(cfg, repoPath, agent);
|
|
27
|
+
}
|
|
28
|
+
finally {
|
|
29
|
+
syncLock.release();
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
async function runPull(cfg, repoPath, agent) {
|
|
23
33
|
let spinner = ora(t('pull.pulling', { repo: cfg.repo })).start();
|
|
24
34
|
try {
|
|
25
35
|
await gitEngine.pull(repoPath, resolveGitBranch(cfg));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAe,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAO,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAY,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAW,iBAAiB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAY,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAe,oBAAoB,CAAC;AACrD,OAAO,EAAE,CAAC,EAAE,MAAoB,YAAY,CAAC;AAE7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAQ,KAAK,CAAC;AAExB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,KAAK,KAAkB,EAAE;IACvD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IAEhC,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IACxB,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC3B,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAE1B,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC1D,IAAI,KAAK;QAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAE5E,
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/commands/pull.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAe,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAO,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAY,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAW,iBAAiB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAa,sBAAsB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAY,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAe,oBAAoB,CAAC;AACrD,OAAO,EAAE,CAAC,EAAE,MAAoB,YAAY,CAAC;AAE7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAQ,KAAK,CAAC;AAExB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,KAAK,KAAkB,EAAE;IACvD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IAEhC,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IACxB,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC3B,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAE1B,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC1D,IAAI,KAAK;QAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAE5E,iEAAiE;IACjE,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjC,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;YAAS,CAAC;QACT,QAAQ,CAAC,OAAO,EAAE,CAAC;IACrB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,OAAO,CACpB,GAA0C,EAC1C,QAAgB,EAChB,KAAkD;IAElD,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IACjE,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;QACtD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,6DAA6D;IAC7D,OAAO,CAAC,IAAI,EAAE,CAAC;IACf,IAAI,MAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,6DAA6D;IAC7D,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5D,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACjC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,MAAM,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrE,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE;QACjC,MAAM,EAAK,MAAM,CAAC,MAAM,CAAC,MAAM;QAC/B,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM;QAClC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM;KACnC,CAAC,CAAC,CAAC;IACJ,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/commands/push.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/commands/push.ts"],"names":[],"mappings":"AAAA;;GAEG;AAYH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1E,MAAM,WAAW,iBAAkB,SAAQ,YAAY;IACrD,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;CACpC;AAED,wBAAsB,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAE,WAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmBtG"}
|
|
@@ -7,6 +7,7 @@ import { resolveGitBranch } from '../core/config.js';
|
|
|
7
7
|
import { ensureMigrated } from '../core/migrate.js';
|
|
8
8
|
import { gitEngine } from '../core/git.js';
|
|
9
9
|
import { syncEngine } from '../core/sync.js';
|
|
10
|
+
import { syncLock } from '../core/sync-lock.js';
|
|
10
11
|
import { validator } from '../utils/validator.js';
|
|
11
12
|
import { logger } from '../utils/logger.js';
|
|
12
13
|
import { t } from '../i18n.js';
|
|
@@ -23,6 +24,16 @@ export async function cmdPush({ message, agent, dryRun } = {}) {
|
|
|
23
24
|
logger.info(t('push.filterAgent', { agent: chalk.cyan(agent) }));
|
|
24
25
|
if (dryRun)
|
|
25
26
|
logger.info(chalk.yellow(t('dryRun.enabled')));
|
|
27
|
+
// ── Acquire sync lock ─────────────────────────────────────────
|
|
28
|
+
await syncLock.acquire(repoPath);
|
|
29
|
+
try {
|
|
30
|
+
return await runPush(cfg, repoPath, hostname, message, agent, dryRun);
|
|
31
|
+
}
|
|
32
|
+
finally {
|
|
33
|
+
syncLock.release();
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
async function runPush(cfg, repoPath, hostname, message, agent, dryRun) {
|
|
26
37
|
const agentTag = agent ? `[${agent}]` : '';
|
|
27
38
|
const msg = message
|
|
28
39
|
? t('push.commitMsgCustom', { message, tag: agentTag, host: hostname })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/commands/push.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/commands/push.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAYH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIzF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAChD,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,GAAG;QAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;KAAE,CAAC,GAAG,SAAS,CAAC;CACvG;AAED,wBAAsB,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAE,WAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmB7F"}
|
|
@@ -11,6 +11,7 @@ import { resolveGitBranch } from '../core/config.js';
|
|
|
11
11
|
import { ensureMigrated } from '../core/migrate.js';
|
|
12
12
|
import { gitEngine } from '../core/git.js';
|
|
13
13
|
import { syncEngine } from '../core/sync.js';
|
|
14
|
+
import { syncLock } from '../core/sync-lock.js';
|
|
14
15
|
import { validator } from '../utils/validator.js';
|
|
15
16
|
import { logger } from '../utils/logger.js';
|
|
16
17
|
import { t } from '../i18n.js';
|
|
@@ -27,7 +28,16 @@ export async function cmdSync({ agent, dryRun } = {}) {
|
|
|
27
28
|
logger.info(t('sync.filterAgent', { agent: chalk.cyan(agent) }));
|
|
28
29
|
if (dryRun)
|
|
29
30
|
logger.info(chalk.yellow(t('dryRun.enabled')));
|
|
30
|
-
// ──
|
|
31
|
+
// ── Acquire sync lock ─────────────────────────────────────────
|
|
32
|
+
await syncLock.acquire(repoPath);
|
|
33
|
+
try {
|
|
34
|
+
return await runSync(cfg, repoPath, hostname, agent, dryRun);
|
|
35
|
+
}
|
|
36
|
+
finally {
|
|
37
|
+
syncLock.release();
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
async function runSync(cfg, repoPath, hostname, agent, dryRun) {
|
|
31
41
|
let spinner = ora(t('sync.fetching')).start();
|
|
32
42
|
let remoteAhead = 0;
|
|
33
43
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAe,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAO,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAY,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAW,iBAAiB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAY,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAe,oBAAoB,CAAC;AACrD,OAAO,EAAE,CAAC,EAAE,MAAoB,YAAY,CAAC;AAE7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAQ,KAAK,CAAC;AASxB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,KAAkB,EAAE;IAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IAEhC,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IACxB,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC3B,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAE1B,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC/C,IAAI,KAAK;QAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5E,IAAI,MAAM;QAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAE3D
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* sync-lock.ts — Prevents concurrent sync operations and enables dirty-state recovery
|
|
3
|
+
*
|
|
4
|
+
* Before sync: writes sync-lock.json with { startedAt, pid }.
|
|
5
|
+
* On completion: deletes the lock.
|
|
6
|
+
* On next sync: if lock exists and PID is dead, cleans dirty state and removes lock.
|
|
7
|
+
* If PID is alive, refuses sync.
|
|
8
|
+
*/
|
|
9
|
+
export interface SyncLock {
|
|
10
|
+
readonly startedAt: string;
|
|
11
|
+
readonly pid: number;
|
|
12
|
+
}
|
|
13
|
+
export declare const syncLock: {
|
|
14
|
+
readonly lockPath: string;
|
|
15
|
+
/**
|
|
16
|
+
* Acquire the sync lock. Throws if another sync is running.
|
|
17
|
+
* If a stale lock from a dead process is found, cleans up first.
|
|
18
|
+
*
|
|
19
|
+
* @param repoPath Path to local git repo (for dirty state cleanup)
|
|
20
|
+
*/
|
|
21
|
+
readonly acquire: (repoPath: string) => Promise<void>;
|
|
22
|
+
/** Release the sync lock */
|
|
23
|
+
readonly release: () => void;
|
|
24
|
+
/** Check if a lock file exists (for doctor command) */
|
|
25
|
+
readonly exists: () => boolean;
|
|
26
|
+
/** Read the current lock (for doctor command) */
|
|
27
|
+
readonly read: () => SyncLock | null;
|
|
28
|
+
/** Clean dirty git state from a failed sync */
|
|
29
|
+
readonly cleanDirtyState: (repoPath: string) => Promise<void>;
|
|
30
|
+
};
|
|
31
|
+
//# sourceMappingURL=sync-lock.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-lock.d.ts","sourceRoot":"","sources":["../../../src/core/sync-lock.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAWH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB;AAuBD,eAAO,MAAM,QAAQ;;IAGnB;;;;;OAKG;iCACqB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;IAqB9C,4BAA4B;4BACjB,IAAI;IAOf,uDAAuD;2BAC7C,OAAO;IAIjB,iDAAiD;yBACzC,QAAQ,GAAG,IAAI;IAIvB,+CAA+C;yCACf,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;CAW9C,CAAC"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* sync-lock.ts — Prevents concurrent sync operations and enables dirty-state recovery
|
|
3
|
+
*
|
|
4
|
+
* Before sync: writes sync-lock.json with { startedAt, pid }.
|
|
5
|
+
* On completion: deletes the lock.
|
|
6
|
+
* On next sync: if lock exists and PID is dead, cleans dirty state and removes lock.
|
|
7
|
+
* If PID is alive, refuses sync.
|
|
8
|
+
*/
|
|
9
|
+
import fs from 'fs';
|
|
10
|
+
import os from 'os';
|
|
11
|
+
import path from 'path';
|
|
12
|
+
import { logger } from '../utils/logger.js';
|
|
13
|
+
import { t } from '../i18n.js';
|
|
14
|
+
const WANGCHUAN_DIR = path.join(os.homedir(), '.wangchuan');
|
|
15
|
+
const LOCK_PATH = path.join(WANGCHUAN_DIR, 'sync-lock.json');
|
|
16
|
+
/** Check if a process with the given PID is still running */
|
|
17
|
+
function isPidAlive(pid) {
|
|
18
|
+
try {
|
|
19
|
+
process.kill(pid, 0);
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
/** Read the lock file, return null if not found or invalid */
|
|
27
|
+
function readLock() {
|
|
28
|
+
if (!fs.existsSync(LOCK_PATH))
|
|
29
|
+
return null;
|
|
30
|
+
try {
|
|
31
|
+
return JSON.parse(fs.readFileSync(LOCK_PATH, 'utf-8'));
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
// Corrupt lock file — treat as stale
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
export const syncLock = {
|
|
39
|
+
lockPath: LOCK_PATH,
|
|
40
|
+
/**
|
|
41
|
+
* Acquire the sync lock. Throws if another sync is running.
|
|
42
|
+
* If a stale lock from a dead process is found, cleans up first.
|
|
43
|
+
*
|
|
44
|
+
* @param repoPath Path to local git repo (for dirty state cleanup)
|
|
45
|
+
*/
|
|
46
|
+
async acquire(repoPath) {
|
|
47
|
+
const existing = readLock();
|
|
48
|
+
if (existing) {
|
|
49
|
+
if (isPidAlive(existing.pid)) {
|
|
50
|
+
throw new Error(t('syncLock.anotherRunning', { pid: existing.pid }));
|
|
51
|
+
}
|
|
52
|
+
// Stale lock — dead process, clean up
|
|
53
|
+
logger.warn(t('syncLock.staleLock', { pid: existing.pid }));
|
|
54
|
+
await this.cleanDirtyState(repoPath);
|
|
55
|
+
this.release();
|
|
56
|
+
}
|
|
57
|
+
const lock = {
|
|
58
|
+
startedAt: new Date().toISOString(),
|
|
59
|
+
pid: process.pid,
|
|
60
|
+
};
|
|
61
|
+
fs.mkdirSync(WANGCHUAN_DIR, { recursive: true });
|
|
62
|
+
fs.writeFileSync(LOCK_PATH, JSON.stringify(lock, null, 2), 'utf-8');
|
|
63
|
+
logger.trace(t('syncLock.acquired'));
|
|
64
|
+
},
|
|
65
|
+
/** Release the sync lock */
|
|
66
|
+
release() {
|
|
67
|
+
if (fs.existsSync(LOCK_PATH)) {
|
|
68
|
+
fs.unlinkSync(LOCK_PATH);
|
|
69
|
+
logger.trace(t('syncLock.released'));
|
|
70
|
+
}
|
|
71
|
+
},
|
|
72
|
+
/** Check if a lock file exists (for doctor command) */
|
|
73
|
+
exists() {
|
|
74
|
+
return fs.existsSync(LOCK_PATH);
|
|
75
|
+
},
|
|
76
|
+
/** Read the current lock (for doctor command) */
|
|
77
|
+
read() {
|
|
78
|
+
return readLock();
|
|
79
|
+
},
|
|
80
|
+
/** Clean dirty git state from a failed sync */
|
|
81
|
+
async cleanDirtyState(repoPath) {
|
|
82
|
+
if (!fs.existsSync(path.join(repoPath, '.git')))
|
|
83
|
+
return;
|
|
84
|
+
try {
|
|
85
|
+
const { simpleGit } = await import('simple-git');
|
|
86
|
+
const git = simpleGit(repoPath);
|
|
87
|
+
await git.reset(['--hard']);
|
|
88
|
+
logger.info(t('syncLock.cleanedDirtyState'));
|
|
89
|
+
}
|
|
90
|
+
catch (err) {
|
|
91
|
+
logger.warn(t('syncLock.cleanFailed', { error: err.message }));
|
|
92
|
+
}
|
|
93
|
+
},
|
|
94
|
+
};
|
|
95
|
+
//# sourceMappingURL=sync-lock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-lock.js","sourceRoot":"","sources":["../../../src/core/sync-lock.ts"],"names":[],"mappings":"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"}
|
package/dist/src/i18n.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/i18n.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,MAAM,MAAM,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAM/B,wBAAgB,OAAO,IAAI,IAAI,CAc9B;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CASxC;AAED,sEAAsE;AACtE,wBAAgB,cAAc,IAAI,IAAI,CAA4B;
|
|
1
|
+
{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../src/i18n.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,MAAM,MAAM,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAM/B,wBAAgB,OAAO,IAAI,IAAI,CAc9B;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CASxC;AAED,sEAAsE;AACtE,wBAAgB,cAAc,IAAI,IAAI,CAA4B;AAmXlE;;;;;GAKG;AACH,wBAAgB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,CAW/E"}
|
package/dist/src/i18n.js
CHANGED
|
@@ -347,6 +347,38 @@ const M = {
|
|
|
347
347
|
'init.differentRepo': ['Already initialized with a different repo: {existing}', '已使用不同仓库初始化: {existing}'],
|
|
348
348
|
'init.useForceSwitch': ['Use --force to switch repo', '如需切换仓库请使用 --force'],
|
|
349
349
|
'init.repoMissing': ['Repo directory missing, re-cloning …', '仓库目录缺失,正在重新克隆 …'],
|
|
350
|
+
// ── sync-lock ──────────────────────────────────────────────────
|
|
351
|
+
'syncLock.anotherRunning': ['Another sync is running (PID {pid}), please wait or kill it', '另一个同步正在进行中 (PID {pid}),请等待或终止该进程'],
|
|
352
|
+
'syncLock.staleLock': ['Stale sync lock found (PID {pid} is dead), cleaning up …', '发现过期同步锁 (PID {pid} 已终止),正在清理 …'],
|
|
353
|
+
'syncLock.acquired': ['Sync lock acquired', '同步锁已获取'],
|
|
354
|
+
'syncLock.released': ['Sync lock released', '同步锁已释放'],
|
|
355
|
+
'syncLock.cleanedDirtyState': ['Cleaned dirty git state from interrupted sync', '已清理被中断同步留下的脏状态'],
|
|
356
|
+
'syncLock.cleanFailed': ['Failed to clean dirty state: {error}', '清理脏状态失败: {error}'],
|
|
357
|
+
// ── doctor command ─────────────────────────────────────────────
|
|
358
|
+
'cli.cmd.doctor': ['Run health checks on the Wangchuan setup', '对忘川配置进行健康检查'],
|
|
359
|
+
'doctor.banner': ['Wangchuan · Doctor', '忘川 · 健康检查'],
|
|
360
|
+
'doctor.configOk': ['Config file exists and is valid', '配置文件存在且有效'],
|
|
361
|
+
'doctor.configMissing': ['Config file not found: {path}', '配置文件未找到: {path}'],
|
|
362
|
+
'doctor.configInvalid': ['Config file is invalid: {error}', '配置文件无效: {error}'],
|
|
363
|
+
'doctor.keyOk': ['Master key exists with correct permissions', '主密钥存在且权限正确'],
|
|
364
|
+
'doctor.keyMissing': ['Master key not found: {path}', '主密钥未找到: {path}'],
|
|
365
|
+
'doctor.keyBadPerms': ['Master key has insecure permissions (expected 0600): {path}', '主密钥权限不安全 (应为 0600): {path}'],
|
|
366
|
+
'doctor.gitOk': ['Git is available', 'Git 可用'],
|
|
367
|
+
'doctor.gitMissing': ['Git is not installed or not in PATH', 'Git 未安装或不在 PATH 中'],
|
|
368
|
+
'doctor.repoOk': ['Git repo is cloned: {path}', 'Git 仓库已克隆: {path}'],
|
|
369
|
+
'doctor.repoMissing': ['Git repo not cloned: {path}', 'Git 仓库未克隆: {path}'],
|
|
370
|
+
'doctor.sshOk': ['Remote repo is accessible', '远端仓库可访问'],
|
|
371
|
+
'doctor.sshFailed': ['Cannot access remote repo: {error}', '无法访问远端仓库: {error}'],
|
|
372
|
+
'doctor.sshTimeout': ['Remote access check timed out (10s)', '远端访问检查超时 (10秒)'],
|
|
373
|
+
'doctor.agentOk': ['Agent {name} workspace exists: {path}', '智能体 {name} 工作区存在: {path}'],
|
|
374
|
+
'doctor.agentMissing': ['Agent {name} workspace not found: {path}', '智能体 {name} 工作区未找到: {path}'],
|
|
375
|
+
'doctor.lockNone': ['No stale sync lock', '无过期同步锁'],
|
|
376
|
+
'doctor.lockStale': ['Stale sync lock found (PID {pid} is dead), run sync to auto-clean', '发现过期同步锁 (PID {pid} 已终止),执行同步可自动清理'],
|
|
377
|
+
'doctor.lockActive': ['Active sync lock (PID {pid})', '同步锁活动中 (PID {pid})'],
|
|
378
|
+
'doctor.integrityOk': ['Integrity checksums match ({count} files)', '完整性校验通过 ({count} 个文件)'],
|
|
379
|
+
'doctor.integrityMissing': ['No integrity.json in repo', '仓库中无 integrity.json'],
|
|
380
|
+
'doctor.integrityFailed': ['{count} files failed integrity check', '{count} 个文件完整性校验失败'],
|
|
381
|
+
'doctor.summary': ['{pass} passed, {warn} warnings, {fail} failed', '{pass} 通过, {warn} 警告, {fail} 失败'],
|
|
350
382
|
};
|
|
351
383
|
/**
|
|
352
384
|
* Translate a message key, optionally interpolating {param} placeholders.
|
package/dist/src/i18n.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/i18n.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/i18n.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* logger.ts —
|
|
2
|
+
* logger.ts — Structured logging with level filtering, timestamps, and JSON output
|
|
3
|
+
*
|
|
4
|
+
* Supports:
|
|
5
|
+
* WANGCHUAN_LOG_LEVEL env: silent | error | warn | info | debug (default: info)
|
|
6
|
+
* WANGCHUAN_LOG_FORMAT env: json — outputs JSON lines for machine parsing
|
|
7
|
+
* Timestamp prefix in debug mode: [ISO8601] [LEVEL] message
|
|
8
|
+
* trace() method for very verbose output (only emitted in debug level)
|
|
3
9
|
*/
|
|
10
|
+
export type LogLevel = 'silent' | 'error' | 'warn' | 'info' | 'debug';
|
|
4
11
|
export declare const logger: {
|
|
5
12
|
readonly info: (...a: unknown[]) => void;
|
|
6
13
|
readonly ok: (...a: unknown[]) => void;
|
|
@@ -8,6 +15,8 @@ export declare const logger: {
|
|
|
8
15
|
readonly error: (...a: unknown[]) => void;
|
|
9
16
|
readonly debug: (...a: unknown[]) => void;
|
|
10
17
|
readonly step: (...a: unknown[]) => void;
|
|
18
|
+
/** Very verbose tracing — only emitted when log level is debug */
|
|
19
|
+
readonly trace: (...a: unknown[]) => void;
|
|
11
20
|
readonly banner: (text: string) => void;
|
|
12
21
|
};
|
|
13
22
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AA4CtE,eAAO,MAAM,MAAM;0BACH,OAAO,EAAE;wBACT,OAAO,EAAE;0BACT,OAAO,EAAE;2BACT,OAAO,EAAE;2BACT,OAAO,EAAE;0BACT,OAAO,EAAE;IAEvB,kEAAkE;2BACpD,OAAO,EAAE;4BAEV,MAAM,KAAG,IAAI;CAUlB,CAAC"}
|
package/dist/src/utils/logger.js
CHANGED
|
@@ -1,21 +1,46 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* logger.ts —
|
|
2
|
+
* logger.ts — Structured logging with level filtering, timestamps, and JSON output
|
|
3
|
+
*
|
|
4
|
+
* Supports:
|
|
5
|
+
* WANGCHUAN_LOG_LEVEL env: silent | error | warn | info | debug (default: info)
|
|
6
|
+
* WANGCHUAN_LOG_FORMAT env: json — outputs JSON lines for machine parsing
|
|
7
|
+
* Timestamp prefix in debug mode: [ISO8601] [LEVEL] message
|
|
8
|
+
* trace() method for very verbose output (only emitted in debug level)
|
|
3
9
|
*/
|
|
4
10
|
import chalk from 'chalk';
|
|
5
|
-
const LEVELS = {
|
|
6
|
-
const rawLevel = process.env['WANGCHUAN_LOG_LEVEL'] ?? 'info';
|
|
11
|
+
const LEVELS = { silent: -1, error: 3, warn: 2, info: 1, debug: 0 };
|
|
12
|
+
const rawLevel = (process.env['WANGCHUAN_LOG_LEVEL'] ?? 'info');
|
|
7
13
|
const currentLevel = LEVELS[rawLevel] ?? LEVELS.info;
|
|
14
|
+
const isJsonFormat = process.env['WANGCHUAN_LOG_FORMAT'] === 'json';
|
|
15
|
+
const isDebugLevel = currentLevel === LEVELS.debug;
|
|
8
16
|
const prefix = {
|
|
9
|
-
info: chalk.cyan('
|
|
10
|
-
ok: chalk.green('
|
|
11
|
-
warn: chalk.yellow('
|
|
12
|
-
error: chalk.red('
|
|
13
|
-
debug: chalk.gray('
|
|
14
|
-
step: chalk.blue('
|
|
17
|
+
info: chalk.cyan('\u2139'),
|
|
18
|
+
ok: chalk.green('\u2714'),
|
|
19
|
+
warn: chalk.yellow('\u26A0'),
|
|
20
|
+
error: chalk.red('\u2716'),
|
|
21
|
+
debug: chalk.gray('\u00B7'),
|
|
22
|
+
step: chalk.blue('\u203A'),
|
|
23
|
+
trace: chalk.gray('\u2026'),
|
|
15
24
|
};
|
|
25
|
+
/** Emit a JSON line to stdout */
|
|
26
|
+
function emitJson(level, args) {
|
|
27
|
+
const msg = args.map(a => (typeof a === 'string' ? a : JSON.stringify(a))).join(' ');
|
|
28
|
+
const line = JSON.stringify({ level, msg, ts: new Date().toISOString() });
|
|
29
|
+
console.log(line);
|
|
30
|
+
}
|
|
16
31
|
function log(level, symbol, ...args) {
|
|
17
32
|
if (LEVELS[level] < currentLevel)
|
|
18
33
|
return;
|
|
34
|
+
if (isJsonFormat) {
|
|
35
|
+
emitJson(level, args);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
if (isDebugLevel) {
|
|
39
|
+
const ts = chalk.gray(`[${new Date().toISOString()}]`);
|
|
40
|
+
const tag = chalk.gray(`[${level.toUpperCase()}]`);
|
|
41
|
+
console.log(ts, tag, symbol, ...args);
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
19
44
|
console.log(symbol, ...args);
|
|
20
45
|
}
|
|
21
46
|
export const logger = {
|
|
@@ -25,9 +50,17 @@ export const logger = {
|
|
|
25
50
|
error: (...a) => log('error', prefix['error'], chalk.red(String(a[0])), ...a.slice(1)),
|
|
26
51
|
debug: (...a) => log('debug', prefix['debug'], chalk.gray(String(a[0])), ...a.slice(1)),
|
|
27
52
|
step: (...a) => log('info', prefix['step'], ...a),
|
|
53
|
+
/** Very verbose tracing — only emitted when log level is debug */
|
|
54
|
+
trace: (...a) => log('debug', prefix['trace'], chalk.gray(String(a[0])), ...a.slice(1)),
|
|
28
55
|
banner(text) {
|
|
56
|
+
if (currentLevel === LEVELS.silent)
|
|
57
|
+
return;
|
|
58
|
+
if (isJsonFormat) {
|
|
59
|
+
emitJson('info', [`\u2554\u2550\u2550 ${text} \u2550\u2550\u2557`]);
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
29
62
|
console.log();
|
|
30
|
-
console.log(chalk.bold.cyan(`
|
|
63
|
+
console.log(chalk.bold.cyan(` \u2554\u2550\u2550 ${text} \u2550\u2550\u2557`));
|
|
31
64
|
console.log();
|
|
32
65
|
},
|
|
33
66
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"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"}
|