@okclaw-build/cli 1.0.0-beta.12 → 1.0.0-beta.14
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/commands/check.js +21 -4
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/edit.js +21 -3
- package/dist/commands/edit.js.map +1 -1
- package/dist/commands/feed.js +48 -16
- package/dist/commands/feed.js.map +1 -1
- package/dist/commands/install.js +34 -9
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/service.js +48 -11
- package/dist/commands/service.js.map +1 -1
- package/dist/commands/show.d.ts +3 -1
- package/dist/commands/show.js +27 -5
- package/dist/commands/show.js.map +1 -1
- package/dist/commands/skill.js +50 -8
- package/dist/commands/skill.js.map +1 -1
- package/dist/commands/uninstall.js +20 -2
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/index.js +67 -3
- package/dist/index.js.map +1 -1
- package/dist/output/mode.d.ts +11 -0
- package/dist/output/mode.js +27 -0
- package/dist/output/mode.js.map +1 -0
- package/dist/output/ndjson.d.ts +57 -0
- package/dist/output/ndjson.js +136 -0
- package/dist/output/ndjson.js.map +1 -0
- package/dist/utils/logger.d.ts +10 -0
- package/dist/utils/logger.js +31 -4
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/mirror.js +7 -0
- package/dist/utils/mirror.js.map +1 -1
- package/package.json +2 -2
package/dist/commands/check.js
CHANGED
|
@@ -1,10 +1,27 @@
|
|
|
1
1
|
import { ensureNodeVersion } from '../utils/deps.js';
|
|
2
2
|
import { configureMirrors } from '../utils/mirror.js';
|
|
3
|
-
import { info, success } from '../utils/logger.js';
|
|
3
|
+
import { info, success, error } from '../utils/logger.js';
|
|
4
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
4
5
|
export async function checkCommand() {
|
|
6
|
+
const emitter = new NdjsonEmitter('ensure_runtime');
|
|
7
|
+
registerExitHandlers(emitter);
|
|
8
|
+
emitter.start('checking system dependencies');
|
|
5
9
|
info('Checking system dependencies...');
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
10
|
+
try {
|
|
11
|
+
emitter.stepStart('check-node', 'checking Node.js version');
|
|
12
|
+
await ensureNodeVersion();
|
|
13
|
+
emitter.stepDone('check-node', 'node ok');
|
|
14
|
+
emitter.stepStart('mirrors', 'configuring mirrors');
|
|
15
|
+
await configureMirrors();
|
|
16
|
+
emitter.stepDone('mirrors', 'mirrors configured');
|
|
17
|
+
success('All dependencies satisfied.');
|
|
18
|
+
emitter.end(true, 0);
|
|
19
|
+
}
|
|
20
|
+
catch (e) {
|
|
21
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
22
|
+
error(msg);
|
|
23
|
+
emitter.end(false, 1, 'E_CHECK_FAILED', { error: msg });
|
|
24
|
+
process.exit(1);
|
|
25
|
+
}
|
|
9
26
|
}
|
|
10
27
|
//# sourceMappingURL=check.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE1E,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACpD,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAE9B,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC9C,IAAI,CAAC,iCAAiC,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,0BAA0B,CAAC,CAAC;QAC5D,MAAM,iBAAiB,EAAE,CAAC;QAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QAE1C,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QACpD,MAAM,gBAAgB,EAAE,CAAC;QACzB,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;QAElD,OAAO,CAAC,6BAA6B,CAAC,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACvB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACvD,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
|
package/dist/commands/edit.js
CHANGED
|
@@ -3,6 +3,7 @@ import { dirname } from 'node:path';
|
|
|
3
3
|
import { shell } from '../utils/shell.js';
|
|
4
4
|
import { info, error } from '../utils/logger.js';
|
|
5
5
|
import { OPENCLAW_HOME, OPENCLAW_WORKSPACE } from '../utils/constants.js';
|
|
6
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
6
7
|
/**
|
|
7
8
|
* 7 个受支持的编辑目标：6 个 markdown 位于 workspace，openclaw.json 位于 OPENCLAW_HOME。
|
|
8
9
|
*/
|
|
@@ -16,24 +17,41 @@ export const TARGETS = {
|
|
|
16
17
|
'openclaw-json': `${OPENCLAW_HOME}/openclaw.json`,
|
|
17
18
|
};
|
|
18
19
|
export async function editCommand(args) {
|
|
20
|
+
const emitter = new NdjsonEmitter('file_write');
|
|
21
|
+
registerExitHandlers(emitter);
|
|
19
22
|
const target = args[0];
|
|
20
23
|
if (!target || !TARGETS[target]) {
|
|
21
24
|
error(`Usage: okclaw edit <${Object.keys(TARGETS).join('|')}> --file <path>`);
|
|
25
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
22
26
|
process.exit(1);
|
|
23
27
|
}
|
|
24
28
|
const fileIdx = args.indexOf('--file');
|
|
25
29
|
const filePath = fileIdx >= 0 ? args[fileIdx + 1] : undefined;
|
|
26
30
|
if (!filePath) {
|
|
27
31
|
error('Missing --file argument');
|
|
32
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
28
33
|
process.exit(1);
|
|
29
34
|
}
|
|
30
35
|
if (!existsSync(filePath)) {
|
|
31
36
|
error(`File not found: ${filePath}`);
|
|
37
|
+
emitter.end(false, 1, 'E_SRC_NOT_FOUND');
|
|
32
38
|
process.exit(1);
|
|
33
39
|
}
|
|
34
40
|
const dest = TARGETS[target];
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
41
|
+
emitter.start(`writing ${target}`, { target, dest });
|
|
42
|
+
try {
|
|
43
|
+
emitter.stepStart('write', `copying to ${dest}`);
|
|
44
|
+
mkdirSync(dirname(dest), { recursive: true });
|
|
45
|
+
await shell(`cp -f '${filePath}' '${dest}'`);
|
|
46
|
+
emitter.stepDone('write', 'written');
|
|
47
|
+
info(`Written to ${dest}`);
|
|
48
|
+
emitter.end(true, 0, undefined, { target, dest });
|
|
49
|
+
}
|
|
50
|
+
catch (e) {
|
|
51
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
52
|
+
error(msg);
|
|
53
|
+
emitter.end(false, 1, 'E_WRITE_FAILED', { error: msg });
|
|
54
|
+
process.exit(1);
|
|
55
|
+
}
|
|
38
56
|
}
|
|
39
57
|
//# sourceMappingURL=edit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/commands/edit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE1E;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAA2B;IAC7C,IAAI,EAAa,GAAG,kBAAkB,UAAU;IAChD,QAAQ,EAAS,GAAG,kBAAkB,cAAc;IACpD,IAAI,EAAa,GAAG,kBAAkB,UAAU;IAChD,MAAM,EAAW,GAAG,kBAAkB,YAAY;IAClD,MAAM,EAAW,GAAG,kBAAkB,YAAY;IAClD,KAAK,EAAY,GAAG,kBAAkB,WAAW;IACjD,eAAe,EAAE,GAAG,aAAa,gBAAgB;CAClD,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAc;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,KAAK,CAAC,uBAAuB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC9E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,KAAK,CAAC,mBAAmB,QAAQ,EAAE,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/commands/edit.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/feed.js
CHANGED
|
@@ -3,6 +3,7 @@ import { join, extname, basename } from 'node:path';
|
|
|
3
3
|
import { spawn } from 'node:child_process';
|
|
4
4
|
import { info, warn, error, success } from '../utils/logger.js';
|
|
5
5
|
import { OPENCLAW_WORKSPACE } from '../utils/constants.js';
|
|
6
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
6
7
|
function run(cmd, args) {
|
|
7
8
|
return new Promise((resolve, reject) => {
|
|
8
9
|
const child = spawn(cmd, args, { stdio: 'inherit' });
|
|
@@ -18,39 +19,63 @@ function run(cmd, args) {
|
|
|
18
19
|
const MEMORY_FILE = `${OPENCLAW_WORKSPACE}/MEMORY.md`;
|
|
19
20
|
const TEXT_EXTENSIONS = new Set(['.md', '.txt', '.text', '.csv', '.json', '.xml', '.yaml', '.yml', '.log']);
|
|
20
21
|
export async function feedCommand(args) {
|
|
22
|
+
const emitter = new NdjsonEmitter('knowledge_feed');
|
|
23
|
+
// registerExitHandlers 在 ndjson + detached 路径里尤为关键：
|
|
24
|
+
// 进程被 SIGKILL 无法捕获；SIGTERM / 异常 / unhandledRejection 都能兜底发 end。
|
|
25
|
+
registerExitHandlers(emitter);
|
|
21
26
|
const fileIdx = args.indexOf('--file');
|
|
22
27
|
const filePath = fileIdx >= 0 ? args[fileIdx + 1] : undefined;
|
|
23
28
|
if (!filePath) {
|
|
24
29
|
error('Usage: okclaw feed --file <path>');
|
|
30
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
25
31
|
process.exit(1);
|
|
26
32
|
}
|
|
27
33
|
if (!existsSync(filePath)) {
|
|
28
34
|
error(`File not found: ${filePath}`);
|
|
35
|
+
emitter.end(false, 1, 'E_SRC_NOT_FOUND');
|
|
29
36
|
process.exit(1);
|
|
30
37
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
if (
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
emitter.start(`feeding ${filePath}`, { filePath });
|
|
39
|
+
try {
|
|
40
|
+
mkdirSync(OPENCLAW_WORKSPACE, { recursive: true });
|
|
41
|
+
const ext = extname(filePath).toLowerCase();
|
|
42
|
+
if (ext === '.zip' || ext === '.gz' || ext === '.tgz' || filePath.endsWith('.tar.gz')) {
|
|
43
|
+
await feedArchive(filePath, emitter);
|
|
44
|
+
}
|
|
45
|
+
else if (isTextFile(ext)) {
|
|
46
|
+
emitter.stepStart('read', `reading ${filePath}`);
|
|
47
|
+
const content = readFileSync(filePath, 'utf-8').trim();
|
|
48
|
+
if (!content) {
|
|
49
|
+
warn('Empty file, skipping');
|
|
50
|
+
emitter.stepDone('read', 'empty file, nothing to feed');
|
|
51
|
+
emitter.end(true, 0, undefined, { skipped: true });
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
emitter.stepDone('read', `read ${content.length} chars`);
|
|
55
|
+
emitter.stepStart('write', `writing ${MEMORY_FILE}`);
|
|
56
|
+
writeFileSync(MEMORY_FILE, `# Memory\n\n## ${basename(filePath)}\n\n${content}\n`);
|
|
57
|
+
emitter.stepDone('write', 'MEMORY.md written');
|
|
58
|
+
success(`MEMORY.md written (${content.length} chars)`);
|
|
41
59
|
}
|
|
42
|
-
|
|
43
|
-
|
|
60
|
+
else {
|
|
61
|
+
error(`Unsupported file type: ${ext}`);
|
|
62
|
+
emitter.end(false, 1, 'E_UNSUPPORTED_FILE_TYPE');
|
|
63
|
+
process.exit(1);
|
|
64
|
+
}
|
|
65
|
+
emitter.end(true, 0, undefined, { filePath });
|
|
44
66
|
}
|
|
45
|
-
|
|
46
|
-
|
|
67
|
+
catch (e) {
|
|
68
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
69
|
+
error(msg);
|
|
70
|
+
emitter.end(false, 1, 'E_FEED_FAILED', { error: msg });
|
|
47
71
|
process.exit(1);
|
|
48
72
|
}
|
|
49
73
|
}
|
|
50
|
-
async function feedArchive(archivePath) {
|
|
74
|
+
async function feedArchive(archivePath, emitter) {
|
|
51
75
|
const tmpDir = '/tmp/okclaw_feed_extract_' + process.pid;
|
|
52
76
|
mkdirSync(tmpDir, { recursive: true });
|
|
53
77
|
try {
|
|
78
|
+
emitter.stepStart('extract', `extracting ${archivePath}`);
|
|
54
79
|
const ext = extname(archivePath).toLowerCase();
|
|
55
80
|
if (ext === '.zip') {
|
|
56
81
|
await run('unzip', ['-o', archivePath, '-d', tmpDir]);
|
|
@@ -59,10 +84,13 @@ async function feedArchive(archivePath) {
|
|
|
59
84
|
await run('tar', ['xzf', archivePath, '-C', tmpDir]);
|
|
60
85
|
}
|
|
61
86
|
const files = collectFiles(tmpDir);
|
|
87
|
+
emitter.stepDone('extract', `extracted ${files.length} file(s)`);
|
|
62
88
|
info(`Extracted ${files.length} file(s) from archive`);
|
|
89
|
+
emitter.stepStart('append', `appending files to ${MEMORY_FILE}`);
|
|
63
90
|
writeFileSync(MEMORY_FILE, '# Memory\n');
|
|
64
91
|
let count = 0;
|
|
65
|
-
for (
|
|
92
|
+
for (let idx = 0; idx < files.length; idx++) {
|
|
93
|
+
const file = files[idx];
|
|
66
94
|
const fileExt = extname(file).toLowerCase();
|
|
67
95
|
if (!isTextFile(fileExt)) {
|
|
68
96
|
warn(`Skipping non-text file: ${basename(file)}`);
|
|
@@ -74,7 +102,11 @@ async function feedArchive(archivePath) {
|
|
|
74
102
|
appendFileSync(MEMORY_FILE, `\n## ${basename(file)}\n\n${content}\n`);
|
|
75
103
|
count++;
|
|
76
104
|
info(`[${count}] Appended: ${basename(file)} (${content.length} chars)`);
|
|
105
|
+
if (files.length > 0) {
|
|
106
|
+
emitter.progress('append', (idx + 1) / files.length, `appended ${count}`);
|
|
107
|
+
}
|
|
77
108
|
}
|
|
109
|
+
emitter.stepDone('append', `MEMORY.md written with ${count} file(s)`);
|
|
78
110
|
success(`MEMORY.md written with ${count} file(s)`);
|
|
79
111
|
}
|
|
80
112
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed.js","sourceRoot":"","sources":["../../src/commands/feed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC5H,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"feed.js","sourceRoot":"","sources":["../../src/commands/feed.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/install.js
CHANGED
|
@@ -5,6 +5,7 @@ import { ChannelInstaller } from '../installers/channel.js';
|
|
|
5
5
|
import { SkillInstaller } from '../installers/skill.js';
|
|
6
6
|
import { configureMirrors } from '../utils/mirror.js';
|
|
7
7
|
import { info, error, success } from '../utils/logger.js';
|
|
8
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
8
9
|
function getInstaller(component) {
|
|
9
10
|
switch (component) {
|
|
10
11
|
case 'openclaw': return new OpenclawInstaller();
|
|
@@ -17,9 +18,12 @@ function getInstaller(component) {
|
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
20
|
export async function installCommand(args) {
|
|
21
|
+
const emitter = new NdjsonEmitter('install');
|
|
22
|
+
registerExitHandlers(emitter);
|
|
20
23
|
const component = args[0];
|
|
21
24
|
if (!component) {
|
|
22
25
|
error('Usage: okclaw install <component> --version <ver> [--config <json>] [--config-file <path>] [--package-url <url>]');
|
|
26
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
23
27
|
process.exit(1);
|
|
24
28
|
}
|
|
25
29
|
let version = '';
|
|
@@ -37,6 +41,7 @@ export async function installCommand(args) {
|
|
|
37
41
|
}
|
|
38
42
|
catch {
|
|
39
43
|
error('Invalid --config JSON');
|
|
44
|
+
emitter.end(false, 1, 'E_CONFIG_JSON');
|
|
40
45
|
process.exit(1);
|
|
41
46
|
}
|
|
42
47
|
continue;
|
|
@@ -48,6 +53,7 @@ export async function installCommand(args) {
|
|
|
48
53
|
}
|
|
49
54
|
catch (e) {
|
|
50
55
|
error(`Failed to read config file: ${e}`);
|
|
56
|
+
emitter.end(false, 1, 'E_CONFIG_FILE');
|
|
51
57
|
process.exit(1);
|
|
52
58
|
}
|
|
53
59
|
continue;
|
|
@@ -59,19 +65,38 @@ export async function installCommand(args) {
|
|
|
59
65
|
}
|
|
60
66
|
if (!version) {
|
|
61
67
|
error('--version is required');
|
|
68
|
+
emitter.end(false, 1, 'E_VERSION_REQUIRED');
|
|
62
69
|
process.exit(1);
|
|
63
70
|
}
|
|
71
|
+
emitter.start(`installing ${component}@${version}`, { component, version });
|
|
64
72
|
info(`Installing ${component}@${version}...`);
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
73
|
+
try {
|
|
74
|
+
emitter.stepStart('check-deps', 'checking system dependencies');
|
|
75
|
+
const installer = getInstaller(component);
|
|
76
|
+
await installer.checkDeps();
|
|
77
|
+
emitter.stepDone('check-deps', 'dependencies ok');
|
|
78
|
+
emitter.stepStart('mirrors', 'configuring npm/pip mirrors');
|
|
79
|
+
await configureMirrors();
|
|
80
|
+
emitter.stepDone('mirrors', 'mirrors configured');
|
|
81
|
+
emitter.stepStart('install', `installing ${component}@${version}`);
|
|
82
|
+
await installer.install(version, packageUrl);
|
|
83
|
+
emitter.stepDone('install', `${component}@${version} installed`);
|
|
84
|
+
if (config) {
|
|
85
|
+
emitter.stepStart('configure', 'applying configuration');
|
|
86
|
+
await installer.configure(config);
|
|
87
|
+
emitter.stepDone('configure', 'configuration applied');
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
info('No config provided, keeping existing configuration.');
|
|
91
|
+
}
|
|
92
|
+
success(`${component}@${version} installed.`);
|
|
93
|
+
emitter.end(true, 0, undefined, { component, version });
|
|
71
94
|
}
|
|
72
|
-
|
|
73
|
-
|
|
95
|
+
catch (e) {
|
|
96
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
97
|
+
error(msg);
|
|
98
|
+
emitter.end(false, 1, 'E_INSTALL_FAILED', { error: msg });
|
|
99
|
+
process.exit(1);
|
|
74
100
|
}
|
|
75
|
-
success(`${component}@${version} installed.`);
|
|
76
101
|
}
|
|
77
102
|
//# sourceMappingURL=install.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/service.js
CHANGED
|
@@ -1,23 +1,60 @@
|
|
|
1
1
|
import { shell, shellCapture } from '../utils/shell.js';
|
|
2
2
|
import { info, success } from '../utils/logger.js';
|
|
3
3
|
import { OPENVIKING_ENV } from '../utils/constants.js';
|
|
4
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
5
|
+
import { isNdjson } from '../output/mode.js';
|
|
6
|
+
async function runSimpleOp(op, step, humanVerb, action) {
|
|
7
|
+
const emitter = new NdjsonEmitter(op);
|
|
8
|
+
registerExitHandlers(emitter);
|
|
9
|
+
emitter.start(`${humanVerb} gateway`);
|
|
10
|
+
info(`${humanVerb} openclaw gateway...`);
|
|
11
|
+
try {
|
|
12
|
+
emitter.stepStart(step, `${humanVerb} gateway`);
|
|
13
|
+
await action();
|
|
14
|
+
emitter.stepDone(step, 'done');
|
|
15
|
+
success(`Gateway ${step}ed.`);
|
|
16
|
+
emitter.end(true, 0);
|
|
17
|
+
}
|
|
18
|
+
catch (e) {
|
|
19
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
20
|
+
emitter.end(false, 1, `E_${op.toUpperCase()}_FAILED`, { error: msg });
|
|
21
|
+
throw e;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
4
24
|
export async function startCommand() {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
25
|
+
await runSimpleOp('start', 'start', 'Starting', async () => {
|
|
26
|
+
await shell(`source ${OPENVIKING_ENV} 2>/dev/null || true; openclaw gateway start`);
|
|
27
|
+
});
|
|
8
28
|
}
|
|
9
29
|
export async function stopCommand() {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
30
|
+
await runSimpleOp('stop', 'stop', 'Stopping', async () => {
|
|
31
|
+
await shell('openclaw gateway stop 2>/dev/null || true');
|
|
32
|
+
});
|
|
13
33
|
}
|
|
14
34
|
export async function restartCommand() {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
35
|
+
await runSimpleOp('restart', 'restart', 'Restarting', async () => {
|
|
36
|
+
await shell(`source ${OPENVIKING_ENV} 2>/dev/null || true; openclaw gateway restart`);
|
|
37
|
+
});
|
|
18
38
|
}
|
|
19
39
|
export async function statusCommand() {
|
|
20
|
-
const
|
|
21
|
-
|
|
40
|
+
const emitter = new NdjsonEmitter('status');
|
|
41
|
+
registerExitHandlers(emitter);
|
|
42
|
+
emitter.start('querying gateway status');
|
|
43
|
+
emitter.stepStart('status', 'running openclaw gateway status');
|
|
44
|
+
try {
|
|
45
|
+
const result = await shellCapture('openclaw gateway status 2>&1 || true');
|
|
46
|
+
const output = result.stdout || result.stderr || 'No output';
|
|
47
|
+
if (!isNdjson()) {
|
|
48
|
+
console.log(output);
|
|
49
|
+
}
|
|
50
|
+
const running = /running|active/i.test(output);
|
|
51
|
+
emitter.stepDone('status', 'status query done');
|
|
52
|
+
emitter.end(true, 0, undefined, { running, rawOutput: output });
|
|
53
|
+
}
|
|
54
|
+
catch (e) {
|
|
55
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
56
|
+
emitter.end(false, 1, 'E_STATUS_FAILED', { error: msg });
|
|
57
|
+
throw e;
|
|
58
|
+
}
|
|
22
59
|
}
|
|
23
60
|
//# sourceMappingURL=service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/commands/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/commands/service.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/show.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* okclaw show <target>
|
|
3
3
|
*
|
|
4
|
-
* 把 target 对应的文件内容原样输出到 stdout
|
|
4
|
+
* 把 target 对应的文件内容原样输出到 stdout（text 模式）；
|
|
5
|
+
* 在 ndjson 模式下，文件内容放到 end 事件的 fields.content（plan 决策 #16）。
|
|
6
|
+
*
|
|
5
7
|
* - 文件存在 → 输出文件内容，exit 0
|
|
6
8
|
* - 文件不存在 → 输出空内容，exit 0（视为尚未创建）
|
|
7
9
|
* - target 非法 → stderr 提示，exit 1
|
package/dist/commands/show.js
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
2
2
|
import { error } from '../utils/logger.js';
|
|
3
3
|
import { TARGETS as DEFAULT_TARGETS } from './edit.js';
|
|
4
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
5
|
+
import { isNdjson } from '../output/mode.js';
|
|
4
6
|
/**
|
|
5
7
|
* okclaw show <target>
|
|
6
8
|
*
|
|
7
|
-
* 把 target 对应的文件内容原样输出到 stdout
|
|
9
|
+
* 把 target 对应的文件内容原样输出到 stdout（text 模式）；
|
|
10
|
+
* 在 ndjson 模式下，文件内容放到 end 事件的 fields.content（plan 决策 #16）。
|
|
11
|
+
*
|
|
8
12
|
* - 文件存在 → 输出文件内容，exit 0
|
|
9
13
|
* - 文件不存在 → 输出空内容，exit 0（视为尚未创建）
|
|
10
14
|
* - target 非法 → stderr 提示，exit 1
|
|
@@ -12,16 +16,34 @@ import { TARGETS as DEFAULT_TARGETS } from './edit.js';
|
|
|
12
16
|
* `targets` 参数用于测试注入；生产调用不传第二个参数，使用 edit.ts 导出的 TARGETS。
|
|
13
17
|
*/
|
|
14
18
|
export async function showCommand(args, targets = DEFAULT_TARGETS) {
|
|
19
|
+
const emitter = new NdjsonEmitter('file_read');
|
|
20
|
+
registerExitHandlers(emitter);
|
|
15
21
|
const target = args[0];
|
|
16
22
|
if (!target || !targets[target]) {
|
|
17
23
|
error(`Usage: okclaw show <${Object.keys(targets).join('|')}>`);
|
|
24
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
18
25
|
process.exit(1);
|
|
19
26
|
}
|
|
20
27
|
const path = targets[target];
|
|
21
|
-
|
|
22
|
-
|
|
28
|
+
emitter.start(`reading ${target}`, { target, path });
|
|
29
|
+
try {
|
|
30
|
+
emitter.stepStart('read', `reading ${path}`);
|
|
31
|
+
const exists = existsSync(path);
|
|
32
|
+
const content = exists ? readFileSync(path, 'utf8') : '';
|
|
33
|
+
if (!isNdjson()) {
|
|
34
|
+
if (exists) {
|
|
35
|
+
process.stdout.write(content);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
emitter.stepDone('read', exists ? 'read ok' : 'file not found, returning empty');
|
|
39
|
+
// end.fields.content 承载返回值（见 spec §plan 决策 #16）
|
|
40
|
+
emitter.end(true, 0, undefined, { target, path, exists, content });
|
|
41
|
+
}
|
|
42
|
+
catch (e) {
|
|
43
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
44
|
+
error(msg);
|
|
45
|
+
emitter.end(false, 1, 'E_READ_FAILED', { error: msg });
|
|
46
|
+
process.exit(1);
|
|
23
47
|
}
|
|
24
|
-
const content = readFileSync(path, 'utf8');
|
|
25
|
-
process.stdout.write(content);
|
|
26
48
|
}
|
|
27
49
|
//# sourceMappingURL=show.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../src/commands/show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../src/commands/show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAc,EACd,UAAkC,eAAe;IAEjD,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,WAAW,CAAC,CAAC;IAC/C,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAE9B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,KAAK,CAAC,uBAAuB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,KAAK,CAAC,WAAW,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAErD,IAAI,CAAC;QACH,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEzD,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAChB,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;QAED,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC;QACjF,gDAAgD;QAChD,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACvD,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
|
package/dist/commands/skill.js
CHANGED
|
@@ -2,22 +2,45 @@ import { readFileSync } from 'node:fs';
|
|
|
2
2
|
import { SkillInstaller } from '../installers/skill.js';
|
|
3
3
|
import { configureMirrors } from '../utils/mirror.js';
|
|
4
4
|
import { info, error, success } from '../utils/logger.js';
|
|
5
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
5
6
|
export async function skillCommand(args) {
|
|
6
7
|
const subCommand = args[0];
|
|
7
8
|
const skillName = args[1];
|
|
8
9
|
if (!subCommand || !['install', 'uninstall'].includes(subCommand)) {
|
|
10
|
+
const emitter = new NdjsonEmitter('skill_install');
|
|
11
|
+
registerExitHandlers(emitter);
|
|
9
12
|
error('Usage: okclaw skill <install|uninstall> <name> [options]');
|
|
13
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
10
14
|
process.exit(1);
|
|
11
15
|
}
|
|
16
|
+
const op = subCommand === 'install' ? 'skill_install' : 'skill_uninstall';
|
|
17
|
+
const emitter = new NdjsonEmitter(op);
|
|
18
|
+
registerExitHandlers(emitter);
|
|
12
19
|
if (!skillName) {
|
|
13
20
|
error(`Usage: okclaw skill ${subCommand} <name>${subCommand === 'install' ? ' --version <ver> [--package-url <url>]' : ''}`);
|
|
21
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
14
22
|
process.exit(1);
|
|
15
23
|
}
|
|
16
24
|
const installer = new SkillInstaller(skillName);
|
|
17
25
|
if (subCommand === 'uninstall') {
|
|
26
|
+
emitter.start(`uninstalling skill ${skillName}`, { skillName });
|
|
18
27
|
info(`Uninstalling skill ${skillName}...`);
|
|
19
|
-
|
|
20
|
-
|
|
28
|
+
try {
|
|
29
|
+
emitter.stepStart('validate', `validating skill name ${skillName}`);
|
|
30
|
+
// installer 内部校验名称，SkillInstaller.uninstall 会在目标不存在时快速返回
|
|
31
|
+
emitter.stepDone('validate', 'skill name ok');
|
|
32
|
+
emitter.stepStart('uninstall', `removing ${skillName}`);
|
|
33
|
+
await installer.uninstall();
|
|
34
|
+
emitter.stepDone('uninstall', 'skill removed');
|
|
35
|
+
success(`Skill ${skillName} uninstalled.`);
|
|
36
|
+
emitter.end(true, 0, undefined, { skillName });
|
|
37
|
+
}
|
|
38
|
+
catch (e) {
|
|
39
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
40
|
+
error(msg);
|
|
41
|
+
emitter.end(false, 1, 'E_SKILL_UNINSTALL_FAILED', { error: msg });
|
|
42
|
+
process.exit(1);
|
|
43
|
+
}
|
|
21
44
|
return;
|
|
22
45
|
}
|
|
23
46
|
// install
|
|
@@ -36,6 +59,7 @@ export async function skillCommand(args) {
|
|
|
36
59
|
}
|
|
37
60
|
catch {
|
|
38
61
|
error('Invalid --config JSON');
|
|
62
|
+
emitter.end(false, 1, 'E_CONFIG_JSON');
|
|
39
63
|
process.exit(1);
|
|
40
64
|
}
|
|
41
65
|
continue;
|
|
@@ -47,6 +71,7 @@ export async function skillCommand(args) {
|
|
|
47
71
|
}
|
|
48
72
|
catch (e) {
|
|
49
73
|
error(`Failed to read config file: ${e}`);
|
|
74
|
+
emitter.end(false, 1, 'E_CONFIG_FILE');
|
|
50
75
|
process.exit(1);
|
|
51
76
|
}
|
|
52
77
|
continue;
|
|
@@ -58,15 +83,32 @@ export async function skillCommand(args) {
|
|
|
58
83
|
}
|
|
59
84
|
if (!version) {
|
|
60
85
|
error('--version is required for install');
|
|
86
|
+
emitter.end(false, 1, 'E_VERSION_REQUIRED');
|
|
61
87
|
process.exit(1);
|
|
62
88
|
}
|
|
89
|
+
emitter.start(`installing skill ${skillName}@${version}`, { skillName, version });
|
|
63
90
|
info(`Installing skill ${skillName}@${version}...`);
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
91
|
+
try {
|
|
92
|
+
emitter.stepStart('validate', 'validating install args');
|
|
93
|
+
await installer.checkDeps();
|
|
94
|
+
emitter.stepDone('validate', 'args ok, deps ready');
|
|
95
|
+
emitter.stepStart('download', `downloading skill ${skillName}@${version}`);
|
|
96
|
+
await configureMirrors();
|
|
97
|
+
await installer.install(version, packageUrl);
|
|
98
|
+
emitter.stepDone('download', 'skill downloaded');
|
|
99
|
+
emitter.stepStart('install', `applying skill ${skillName}`);
|
|
100
|
+
if (config) {
|
|
101
|
+
await installer.configure(config);
|
|
102
|
+
}
|
|
103
|
+
emitter.stepDone('install', 'skill installed');
|
|
104
|
+
success(`Skill ${skillName}@${version} installed.`);
|
|
105
|
+
emitter.end(true, 0, undefined, { skillName, version });
|
|
106
|
+
}
|
|
107
|
+
catch (e) {
|
|
108
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
109
|
+
error(msg);
|
|
110
|
+
emitter.end(false, 1, 'E_SKILL_INSTALL_FAILED', { error: msg });
|
|
111
|
+
process.exit(1);
|
|
69
112
|
}
|
|
70
|
-
success(`Skill ${skillName}@${version} installed.`);
|
|
71
113
|
}
|
|
72
114
|
//# sourceMappingURL=skill.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill.js","sourceRoot":"","sources":["../../src/commands/skill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"skill.js","sourceRoot":"","sources":["../../src/commands/skill.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { OpenclawInstaller } from '../installers/openclaw.js';
|
|
2
2
|
import { error, info, success } from '../utils/logger.js';
|
|
3
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
3
4
|
function getInstaller(component) {
|
|
4
5
|
switch (component) {
|
|
5
6
|
case 'openclaw': return new OpenclawInstaller();
|
|
@@ -7,22 +8,39 @@ function getInstaller(component) {
|
|
|
7
8
|
}
|
|
8
9
|
}
|
|
9
10
|
export async function uninstallCommand(args) {
|
|
11
|
+
const emitter = new NdjsonEmitter('uninstall');
|
|
12
|
+
registerExitHandlers(emitter);
|
|
10
13
|
const component = args[0];
|
|
11
14
|
if (!component) {
|
|
12
15
|
error('Usage: okclaw uninstall <component>');
|
|
16
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
13
17
|
process.exit(1);
|
|
14
18
|
}
|
|
15
19
|
const installer = getInstaller(component);
|
|
16
20
|
if (!installer) {
|
|
17
21
|
error(`Uninstall not supported for component: ${component}`);
|
|
22
|
+
emitter.end(false, 1, 'E_UNSUPPORTED');
|
|
18
23
|
process.exit(1);
|
|
19
24
|
}
|
|
20
25
|
if (!installer.uninstall) {
|
|
21
26
|
error(`Component ${component} does not support uninstall`);
|
|
27
|
+
emitter.end(false, 1, 'E_UNSUPPORTED');
|
|
22
28
|
process.exit(1);
|
|
23
29
|
}
|
|
30
|
+
emitter.start(`uninstalling ${component}`, { component });
|
|
24
31
|
info(`Uninstalling ${component}...`);
|
|
25
|
-
|
|
26
|
-
|
|
32
|
+
try {
|
|
33
|
+
emitter.stepStart('uninstall', `running uninstall for ${component}`);
|
|
34
|
+
await installer.uninstall();
|
|
35
|
+
emitter.stepDone('uninstall', `${component} uninstalled`);
|
|
36
|
+
success(`${component} uninstalled.`);
|
|
37
|
+
emitter.end(true, 0, undefined, { component });
|
|
38
|
+
}
|
|
39
|
+
catch (e) {
|
|
40
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
41
|
+
error(msg);
|
|
42
|
+
emitter.end(false, 1, 'E_UNINSTALL_FAILED', { error: msg });
|
|
43
|
+
process.exit(1);
|
|
44
|
+
}
|
|
27
45
|
}
|
|
28
46
|
//# sourceMappingURL=uninstall.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../src/commands/uninstall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../src/commands/uninstall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE1E,SAAS,YAAY,CAAC,SAAiB;IACrC,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,UAAU,CAAC,CAAC,OAAO,IAAI,iBAAiB,EAAE,CAAC;QAChD,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAc;IACnD,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,WAAW,CAAC,CAAC;IAC/C,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAE9B,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1B,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;IAC1C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,KAAK,CAAC,0CAA0C,SAAS,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;QACzB,KAAK,CAAC,aAAa,SAAS,6BAA6B,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,gBAAgB,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,gBAAgB,SAAS,KAAK,CAAC,CAAC;IAErC,IAAI,CAAC;QACH,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE,yBAAyB,SAAS,EAAE,CAAC,CAAC;QACrE,MAAM,SAAS,CAAC,SAAS,EAAE,CAAC;QAC5B,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,SAAS,cAAc,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,SAAS,eAAe,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACvD,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,oBAAoB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -9,7 +9,51 @@ import { startCommand, stopCommand, restartCommand, statusCommand } from './comm
|
|
|
9
9
|
import { skillCommand } from './commands/skill.js';
|
|
10
10
|
import { ensureRoot } from './utils/shell.js';
|
|
11
11
|
import { error } from './utils/logger.js';
|
|
12
|
-
|
|
12
|
+
import { setNdjsonPath, setOutputMode, isNdjson } from './output/mode.js';
|
|
13
|
+
import { getActiveEmitter, NdjsonEmitter } from './output/ndjson.js';
|
|
14
|
+
/**
|
|
15
|
+
* 从 argv 里抽出全局 flag --output=<mode> 和 --op-id=<uuid>，返回剩余参数。
|
|
16
|
+
* 支持 "--flag=value" 与 "--flag value" 两种写法。
|
|
17
|
+
*/
|
|
18
|
+
function extractGlobalFlags(argv) {
|
|
19
|
+
const rest = [];
|
|
20
|
+
let output = 'text';
|
|
21
|
+
let opId;
|
|
22
|
+
let ndjsonPath;
|
|
23
|
+
for (let i = 0; i < argv.length; i++) {
|
|
24
|
+
const arg = argv[i];
|
|
25
|
+
if (arg === '--output' && argv[i + 1]) {
|
|
26
|
+
output = argv[++i] === 'ndjson' ? 'ndjson' : 'text';
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
if (arg.startsWith('--output=')) {
|
|
30
|
+
output = arg.slice('--output='.length) === 'ndjson' ? 'ndjson' : 'text';
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
if (arg === '--op-id' && argv[i + 1]) {
|
|
34
|
+
opId = argv[++i];
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
if (arg.startsWith('--op-id=')) {
|
|
38
|
+
opId = arg.slice('--op-id='.length);
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
if (arg === '--ndjson-path' && argv[i + 1]) {
|
|
42
|
+
ndjsonPath = argv[++i];
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
45
|
+
if (arg.startsWith('--ndjson-path=')) {
|
|
46
|
+
ndjsonPath = arg.slice('--ndjson-path='.length);
|
|
47
|
+
continue;
|
|
48
|
+
}
|
|
49
|
+
rest.push(arg);
|
|
50
|
+
}
|
|
51
|
+
return { rest, output, opId, ndjsonPath };
|
|
52
|
+
}
|
|
53
|
+
const { rest, output, opId, ndjsonPath } = extractGlobalFlags(process.argv.slice(2));
|
|
54
|
+
setOutputMode(output, opId);
|
|
55
|
+
setNdjsonPath(ndjsonPath);
|
|
56
|
+
const [command, ...args] = rest;
|
|
13
57
|
async function main() {
|
|
14
58
|
// All commands require root (or auto-sudo)
|
|
15
59
|
if (command && command !== '--help' && command !== '-h' && command !== '--version' && command !== '-v') {
|
|
@@ -70,7 +114,12 @@ function printHelp() {
|
|
|
70
114
|
console.log(`
|
|
71
115
|
okclaw - OKClaw Deployment CLI
|
|
72
116
|
|
|
73
|
-
Usage: okclaw <command> [args...]
|
|
117
|
+
Usage: okclaw [global-flags] <command> [args...]
|
|
118
|
+
|
|
119
|
+
Global flags (before the command):
|
|
120
|
+
--output text|ndjson Output mode (default: text)
|
|
121
|
+
--op-id <uuid> Operation id, echoed in every ndjson event's fields.opId
|
|
122
|
+
--ndjson-path <path> Append ndjson to file instead of stdout (used in detached mode)
|
|
74
123
|
|
|
75
124
|
okclaw skill install <name> --version <ver> [--package-url <url>] Install a skill
|
|
76
125
|
okclaw skill uninstall <name> Uninstall a skill
|
|
@@ -112,7 +161,22 @@ Notes:
|
|
|
112
161
|
`);
|
|
113
162
|
}
|
|
114
163
|
main().catch((err) => {
|
|
115
|
-
|
|
164
|
+
const msg = String(err?.message || err);
|
|
165
|
+
// bug#4 修：顶层 catch 兜底发 end，防止 os-api 永远等不到终态。
|
|
166
|
+
// 有活 emitter 就用它；没有（比如 extractGlobalFlags/ensureRoot 阶段崩）→ 直接写一行 fallback。
|
|
167
|
+
if (isNdjson()) {
|
|
168
|
+
const active = getActiveEmitter();
|
|
169
|
+
if (active && !active.hasEnded()) {
|
|
170
|
+
active.end(false, 1, 'E_TOPLEVEL', { error: msg });
|
|
171
|
+
}
|
|
172
|
+
else if (!active) {
|
|
173
|
+
// 没有任何 emitter 被注册过：手写一条 end 行
|
|
174
|
+
const fallback = new NdjsonEmitter('unknown');
|
|
175
|
+
fallback.start('top-level error');
|
|
176
|
+
fallback.end(false, 1, 'E_TOPLEVEL', { error: msg });
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
error(msg);
|
|
116
180
|
process.exit(1);
|
|
117
181
|
});
|
|
118
182
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CLI 输出模式全局状态。index.ts 解析 --output / --op-id 后注入；
|
|
3
|
+
* ndjson.ts 与 logger.ts 读取以决定行为。
|
|
4
|
+
*/
|
|
5
|
+
export type OutputMode = 'text' | 'ndjson';
|
|
6
|
+
export declare function setOutputMode(mode: OutputMode, opId?: string): void;
|
|
7
|
+
export declare function setNdjsonPath(path: string | undefined): void;
|
|
8
|
+
export declare function getOutputMode(): OutputMode;
|
|
9
|
+
export declare function getOpId(): string | undefined;
|
|
10
|
+
export declare function getNdjsonPath(): string | undefined;
|
|
11
|
+
export declare function isNdjson(): boolean;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CLI 输出模式全局状态。index.ts 解析 --output / --op-id 后注入；
|
|
3
|
+
* ndjson.ts 与 logger.ts 读取以决定行为。
|
|
4
|
+
*/
|
|
5
|
+
let currentMode = 'text';
|
|
6
|
+
let currentOpId;
|
|
7
|
+
let currentNdjsonPath;
|
|
8
|
+
export function setOutputMode(mode, opId) {
|
|
9
|
+
currentMode = mode;
|
|
10
|
+
currentOpId = opId;
|
|
11
|
+
}
|
|
12
|
+
export function setNdjsonPath(path) {
|
|
13
|
+
currentNdjsonPath = path;
|
|
14
|
+
}
|
|
15
|
+
export function getOutputMode() {
|
|
16
|
+
return currentMode;
|
|
17
|
+
}
|
|
18
|
+
export function getOpId() {
|
|
19
|
+
return currentOpId;
|
|
20
|
+
}
|
|
21
|
+
export function getNdjsonPath() {
|
|
22
|
+
return currentNdjsonPath;
|
|
23
|
+
}
|
|
24
|
+
export function isNdjson() {
|
|
25
|
+
return currentMode === 'ndjson';
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=mode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../src/output/mode.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,IAAI,WAAW,GAAe,MAAM,CAAC;AACrC,IAAI,WAA+B,CAAC;AACpC,IAAI,iBAAqC,CAAC;AAE1C,MAAM,UAAU,aAAa,CAAC,IAAgB,EAAE,IAAa;IAC3D,WAAW,GAAG,IAAI,CAAC;IACnB,WAAW,GAAG,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAwB;IACpD,iBAAiB,GAAG,IAAI,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,OAAO;IACrB,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,OAAO,WAAW,KAAK,QAAQ,CAAC;AAClC,CAAC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Envelope 字段说明见 docs/superpowers/specs/2026-04-19-host-operation-refactor-design.md
|
|
3
|
+
* §okclaw-cli ndjson 输出契约。
|
|
4
|
+
*/
|
|
5
|
+
export type OpPhase = 'start' | 'step_start' | 'progress' | 'step_done' | 'log' | 'end';
|
|
6
|
+
export type Level = 'debug' | 'info' | 'warn' | 'error';
|
|
7
|
+
export interface NdjsonEvent {
|
|
8
|
+
ts: string;
|
|
9
|
+
seq: number;
|
|
10
|
+
op: string;
|
|
11
|
+
phase: OpPhase;
|
|
12
|
+
step?: string;
|
|
13
|
+
level: Level;
|
|
14
|
+
progress?: number;
|
|
15
|
+
msg?: string;
|
|
16
|
+
fields?: Record<string, unknown>;
|
|
17
|
+
code?: string;
|
|
18
|
+
}
|
|
19
|
+
export type NdjsonWriter = (line: string) => void;
|
|
20
|
+
/**
|
|
21
|
+
* 单 op 的事件发射器。在 text 模式下所有方法都是 no-op；ndjson 模式才写出。
|
|
22
|
+
*
|
|
23
|
+
* 约定：
|
|
24
|
+
* - seq 单调递增，同一 emitter 实例内唯一
|
|
25
|
+
* - end() 只能发一次，重复调用忽略
|
|
26
|
+
* - 非正常退出（exception/signal）由 registerExitHandlers 兜底补 end
|
|
27
|
+
*/
|
|
28
|
+
export declare class NdjsonEmitter {
|
|
29
|
+
private seq;
|
|
30
|
+
private readonly op;
|
|
31
|
+
private readonly writer;
|
|
32
|
+
private ended;
|
|
33
|
+
constructor(op: string, writer?: NdjsonWriter);
|
|
34
|
+
start(msg?: string, fields?: Record<string, unknown>): void;
|
|
35
|
+
stepStart(step: string, msg: string, fields?: Record<string, unknown>): void;
|
|
36
|
+
progress(step: string, progress: number, msg?: string, fields?: Record<string, unknown>): void;
|
|
37
|
+
stepDone(step: string, msg: string, fields?: Record<string, unknown>): void;
|
|
38
|
+
/**
|
|
39
|
+
* 通用日志事件。走独立 phase="log"（bug#7 修：之前借用 phase="progress" 会
|
|
40
|
+
* 污染"取 max(progress) 作为当前进度"的聚合逻辑）。用 level 区分严重度。
|
|
41
|
+
*/
|
|
42
|
+
log(level: Level, msg: string, fields?: Record<string, unknown>): void;
|
|
43
|
+
/**
|
|
44
|
+
* 终态事件；必发。ok=false 时 fields 里加 errorCode（可选）。
|
|
45
|
+
* end 事件的 fields 可承载 op-specific 返回值（如 FILE_READ 的 content）。
|
|
46
|
+
*/
|
|
47
|
+
end(ok: boolean, exitCode: number, code?: string, fields?: Record<string, unknown>): void;
|
|
48
|
+
hasEnded(): boolean;
|
|
49
|
+
private emit;
|
|
50
|
+
}
|
|
51
|
+
export declare function getActiveEmitter(): NdjsonEmitter | null;
|
|
52
|
+
export declare function clearActiveEmitter(): void;
|
|
53
|
+
/**
|
|
54
|
+
* 注册进程兜底，确保 ndjson 模式下 end 事件必发（plan P1 风险：忘 flush → os-api 卡死）。
|
|
55
|
+
* 只在 ndjson 模式生效。
|
|
56
|
+
*/
|
|
57
|
+
export declare function registerExitHandlers(emitter: NdjsonEmitter): void;
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { appendFileSync } from 'node:fs';
|
|
2
|
+
import { getNdjsonPath, getOpId, isNdjson } from './mode.js';
|
|
3
|
+
const defaultWriter = (line) => {
|
|
4
|
+
const path = getNdjsonPath();
|
|
5
|
+
if (path) {
|
|
6
|
+
appendFileSync(path, line);
|
|
7
|
+
}
|
|
8
|
+
else {
|
|
9
|
+
process.stdout.write(line);
|
|
10
|
+
}
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* 单 op 的事件发射器。在 text 模式下所有方法都是 no-op；ndjson 模式才写出。
|
|
14
|
+
*
|
|
15
|
+
* 约定：
|
|
16
|
+
* - seq 单调递增，同一 emitter 实例内唯一
|
|
17
|
+
* - end() 只能发一次，重复调用忽略
|
|
18
|
+
* - 非正常退出（exception/signal）由 registerExitHandlers 兜底补 end
|
|
19
|
+
*/
|
|
20
|
+
export class NdjsonEmitter {
|
|
21
|
+
seq = 0;
|
|
22
|
+
op;
|
|
23
|
+
writer;
|
|
24
|
+
ended = false;
|
|
25
|
+
constructor(op, writer = defaultWriter) {
|
|
26
|
+
this.op = op;
|
|
27
|
+
this.writer = writer;
|
|
28
|
+
}
|
|
29
|
+
start(msg = '', fields) {
|
|
30
|
+
this.emit('start', 'info', { msg, fields });
|
|
31
|
+
}
|
|
32
|
+
stepStart(step, msg, fields) {
|
|
33
|
+
this.emit('step_start', 'info', { step, msg, fields });
|
|
34
|
+
}
|
|
35
|
+
progress(step, progress, msg, fields) {
|
|
36
|
+
const clamped = Number.isFinite(progress) ? Math.max(0, Math.min(1, progress)) : undefined;
|
|
37
|
+
this.emit('progress', 'info', { step, progress: clamped, msg, fields });
|
|
38
|
+
}
|
|
39
|
+
stepDone(step, msg, fields) {
|
|
40
|
+
this.emit('step_done', 'info', { step, msg, fields });
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* 通用日志事件。走独立 phase="log"（bug#7 修：之前借用 phase="progress" 会
|
|
44
|
+
* 污染"取 max(progress) 作为当前进度"的聚合逻辑）。用 level 区分严重度。
|
|
45
|
+
*/
|
|
46
|
+
log(level, msg, fields) {
|
|
47
|
+
this.emit('log', level, { msg, fields });
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* 终态事件；必发。ok=false 时 fields 里加 errorCode（可选）。
|
|
51
|
+
* end 事件的 fields 可承载 op-specific 返回值（如 FILE_READ 的 content）。
|
|
52
|
+
*/
|
|
53
|
+
end(ok, exitCode, code, fields) {
|
|
54
|
+
if (this.ended)
|
|
55
|
+
return;
|
|
56
|
+
this.ended = true;
|
|
57
|
+
const mergedFields = { ok, exitCode, ...(fields ?? {}) };
|
|
58
|
+
this.emit('end', ok ? 'info' : 'error', {
|
|
59
|
+
msg: ok ? 'success' : 'failed',
|
|
60
|
+
fields: mergedFields,
|
|
61
|
+
code,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
hasEnded() {
|
|
65
|
+
return this.ended;
|
|
66
|
+
}
|
|
67
|
+
emit(phase, level, partial) {
|
|
68
|
+
if (!isNdjson())
|
|
69
|
+
return;
|
|
70
|
+
const opId = getOpId();
|
|
71
|
+
const userFields = { ...(partial.fields ?? {}) };
|
|
72
|
+
if (opId !== undefined && userFields.opId === undefined) {
|
|
73
|
+
userFields.opId = opId;
|
|
74
|
+
}
|
|
75
|
+
const event = {
|
|
76
|
+
ts: new Date().toISOString(),
|
|
77
|
+
seq: ++this.seq,
|
|
78
|
+
op: this.op,
|
|
79
|
+
phase,
|
|
80
|
+
level,
|
|
81
|
+
};
|
|
82
|
+
if (partial.step !== undefined)
|
|
83
|
+
event.step = partial.step;
|
|
84
|
+
if (partial.progress !== undefined)
|
|
85
|
+
event.progress = partial.progress;
|
|
86
|
+
if (partial.msg !== undefined && partial.msg !== '')
|
|
87
|
+
event.msg = partial.msg;
|
|
88
|
+
if (Object.keys(userFields).length > 0)
|
|
89
|
+
event.fields = userFields;
|
|
90
|
+
if (partial.code !== undefined)
|
|
91
|
+
event.code = partial.code;
|
|
92
|
+
this.writer(JSON.stringify(event) + '\n');
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
// bug#4 修：顶层 main().catch 里也要能拿到活 emitter 发 end 兜底。
|
|
96
|
+
// registerExitHandlers 时把 emitter 挂到 module 级，exposé getActiveEmitter 给 index.ts。
|
|
97
|
+
let activeEmitter = null;
|
|
98
|
+
export function getActiveEmitter() {
|
|
99
|
+
return activeEmitter;
|
|
100
|
+
}
|
|
101
|
+
export function clearActiveEmitter() {
|
|
102
|
+
activeEmitter = null;
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* 注册进程兜底，确保 ndjson 模式下 end 事件必发（plan P1 风险：忘 flush → os-api 卡死）。
|
|
106
|
+
* 只在 ndjson 模式生效。
|
|
107
|
+
*/
|
|
108
|
+
export function registerExitHandlers(emitter) {
|
|
109
|
+
if (!isNdjson())
|
|
110
|
+
return;
|
|
111
|
+
activeEmitter = emitter;
|
|
112
|
+
const finalize = (exitCode, code) => {
|
|
113
|
+
if (!emitter.hasEnded()) {
|
|
114
|
+
emitter.end(false, exitCode, code);
|
|
115
|
+
}
|
|
116
|
+
};
|
|
117
|
+
process.on('uncaughtException', (err) => {
|
|
118
|
+
finalize(1, 'E_UNCAUGHT');
|
|
119
|
+
process.stderr.write(String(err?.stack ?? err) + '\n');
|
|
120
|
+
process.exit(1);
|
|
121
|
+
});
|
|
122
|
+
process.on('unhandledRejection', (reason) => {
|
|
123
|
+
finalize(1, 'E_UNHANDLED_REJECTION');
|
|
124
|
+
process.stderr.write(String(reason) + '\n');
|
|
125
|
+
process.exit(1);
|
|
126
|
+
});
|
|
127
|
+
process.on('SIGTERM', () => {
|
|
128
|
+
finalize(143, 'E_SIGTERM');
|
|
129
|
+
process.exit(143);
|
|
130
|
+
});
|
|
131
|
+
process.on('SIGINT', () => {
|
|
132
|
+
finalize(130, 'E_SIGINT');
|
|
133
|
+
process.exit(130);
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
//# sourceMappingURL=ndjson.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ndjson.js","sourceRoot":"","sources":["../../src/output/ndjson.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/logger.d.ts
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 人类可读 log。
|
|
3
|
+
*
|
|
4
|
+
* ndjson 模式下：所有业务级 log（info / warn / success / error）静默。
|
|
5
|
+
* - info/warn/success 本就无关紧要，静默避免污染 stdout 结构化流
|
|
6
|
+
* - error 也静默（bug#5 修）：业务错误必须通过 emitter.end(false, code, { error: msg }) 承载，
|
|
7
|
+
* 与 design 契约对齐（stderr 仅给真正的崩溃栈，由 registerExitHandlers 的 uncaughtException 打印）
|
|
8
|
+
*
|
|
9
|
+
* 调用方注意：ndjson 模式下调 error(msg) 不会让用户看见消息，务必把 msg 塞进 emitter.end 的 fields。
|
|
10
|
+
*/
|
|
1
11
|
export declare function info(msg: string): void;
|
|
2
12
|
export declare function warn(msg: string): void;
|
|
3
13
|
export declare function error(msg: string): void;
|
package/dist/utils/logger.js
CHANGED
|
@@ -1,5 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { isNdjson } from '../output/mode.js';
|
|
2
|
+
/**
|
|
3
|
+
* 人类可读 log。
|
|
4
|
+
*
|
|
5
|
+
* ndjson 模式下：所有业务级 log（info / warn / success / error）静默。
|
|
6
|
+
* - info/warn/success 本就无关紧要，静默避免污染 stdout 结构化流
|
|
7
|
+
* - error 也静默（bug#5 修）：业务错误必须通过 emitter.end(false, code, { error: msg }) 承载，
|
|
8
|
+
* 与 design 契约对齐（stderr 仅给真正的崩溃栈，由 registerExitHandlers 的 uncaughtException 打印）
|
|
9
|
+
*
|
|
10
|
+
* 调用方注意：ndjson 模式下调 error(msg) 不会让用户看见消息，务必把 msg 塞进 emitter.end 的 fields。
|
|
11
|
+
*/
|
|
12
|
+
export function info(msg) {
|
|
13
|
+
if (isNdjson())
|
|
14
|
+
return;
|
|
15
|
+
console.log(`[okclaw] ${msg}`);
|
|
16
|
+
}
|
|
17
|
+
export function warn(msg) {
|
|
18
|
+
if (isNdjson())
|
|
19
|
+
return;
|
|
20
|
+
console.log(`[okclaw] WARN: ${msg}`);
|
|
21
|
+
}
|
|
22
|
+
export function error(msg) {
|
|
23
|
+
if (isNdjson())
|
|
24
|
+
return;
|
|
25
|
+
console.error(`[okclaw] ERROR: ${msg}`);
|
|
26
|
+
}
|
|
27
|
+
export function success(msg) {
|
|
28
|
+
if (isNdjson())
|
|
29
|
+
return;
|
|
30
|
+
console.log(`[okclaw] ✓ ${msg}`);
|
|
31
|
+
}
|
|
5
32
|
//# sourceMappingURL=logger.js.map
|
package/dist/utils/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,IAAI,CAAC,GAAW,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;;;;;;;;GASG;AAEH,MAAM,UAAU,IAAI,CAAC,GAAW;IAC9B,IAAI,QAAQ,EAAE;QAAE,OAAO;IACvB,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,GAAW;IAC9B,IAAI,QAAQ,EAAE;QAAE,OAAO;IACvB,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAW;IAC/B,IAAI,QAAQ,EAAE;QAAE,OAAO;IACvB,OAAO,CAAC,KAAK,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,GAAW;IACjC,IAAI,QAAQ,EAAE;QAAE,OAAO;IACvB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;AACnC,CAAC"}
|
package/dist/utils/mirror.js
CHANGED
|
@@ -4,6 +4,13 @@ import { NPM_REGISTRY, PIP_INDEX_URL, PIP_TRUSTED_HOST } from './constants.js';
|
|
|
4
4
|
export async function configureMirrors() {
|
|
5
5
|
info('Configuring China mirrors...');
|
|
6
6
|
await shell(`npm config set registry ${NPM_REGISTRY}`).catch(() => { });
|
|
7
|
+
// 部分 npm 包（如 openclaw 依赖的 libsignal-node）用 git+ssh://git@github.com/...
|
|
8
|
+
// 引用 GitHub 仓库。云主机 root 账户默认没有 GitHub SSH key 会拉取失败。
|
|
9
|
+
// 这里把 ssh://git@github.com/ 和 git@github.com: 都重写成 https://github.com/（匿名可读）。
|
|
10
|
+
// 注意: 同一个 URL name 下要写多个 insteadOf 必须用 --add，否则第二次 set 会覆盖第一次。
|
|
11
|
+
await shell(`git config --global --unset-all url."https://github.com/".insteadOf 2>/dev/null || true`).catch(() => { });
|
|
12
|
+
await shell(`git config --global --add url."https://github.com/".insteadOf ssh://git@github.com/`).catch(() => { });
|
|
13
|
+
await shell(`git config --global --add url."https://github.com/".insteadOf git@github.com:`).catch(() => { });
|
|
7
14
|
// Use /root/.pip — not ~/
|
|
8
15
|
await shell(`mkdir -p /root/.pip && cat > /root/.pip/pip.conf << 'EOF'
|
|
9
16
|
[global]
|
package/dist/utils/mirror.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/utils/mirror.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE/E,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAErC,MAAM,KAAK,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAEvE,0BAA0B;IAC1B,MAAM,KAAK,CAAC;;cAEA,aAAa;iBACV,gBAAgB;IAC7B,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAEpB,IAAI,CAAC,qBAAqB,CAAC,CAAC;AAC9B,CAAC"}
|
|
1
|
+
{"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/utils/mirror.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE/E,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAErC,MAAM,KAAK,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAEvE,wEAAwE;IACxE,qDAAqD;IACrD,8EAA8E;IAC9E,+DAA+D;IAC/D,MAAM,KAAK,CACT,yFAAyF,CAC1F,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAClB,MAAM,KAAK,CACT,qFAAqF,CACtF,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAClB,MAAM,KAAK,CACT,+EAA+E,CAChF,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAElB,0BAA0B;IAC1B,MAAM,KAAK,CAAC;;cAEA,aAAa;iBACV,gBAAgB;IAC7B,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAEpB,IAAI,CAAC,qBAAqB,CAAC,CAAC;AAC9B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@okclaw-build/cli",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.14",
|
|
4
4
|
"description": "OKClaw deployment CLI - install and manage OpenClaw, OpenViking, and channel plugins",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"build": "tsc",
|
|
12
12
|
"dev": "tsc --watch",
|
|
13
13
|
"prepublishOnly": "npm run build",
|
|
14
|
-
"test": "tsc -p tsconfig.test.json && node --test dist-test/tests
|
|
14
|
+
"test": "tsc -p tsconfig.test.json && node --test dist-test/tests/*.test.js dist-test/tests/*/*.test.js"
|
|
15
15
|
},
|
|
16
16
|
"keywords": ["openclaw", "openviking", "deploy", "cli"],
|
|
17
17
|
"license": "MIT",
|