@okclaw-build/cli 1.0.0-beta.6 → 1.0.0-beta.61
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/bridge/daemon/channel-auth-runtime.d.ts +16 -0
- package/dist/bridge/daemon/channel-auth-runtime.js +2 -0
- package/dist/bridge/daemon/channel-auth-runtime.js.map +1 -0
- package/dist/bridge/daemon/config.d.ts +24 -0
- package/dist/bridge/daemon/config.js +96 -0
- package/dist/bridge/daemon/config.js.map +1 -0
- package/dist/bridge/daemon/daemon.d.ts +7 -0
- package/dist/bridge/daemon/daemon.js +32 -0
- package/dist/bridge/daemon/daemon.js.map +1 -0
- package/dist/bridge/daemon/event-id.d.ts +2 -0
- package/dist/bridge/daemon/event-id.js +18 -0
- package/dist/bridge/daemon/event-id.js.map +1 -0
- package/dist/bridge/daemon/frames.d.ts +81 -0
- package/dist/bridge/daemon/frames.js +64 -0
- package/dist/bridge/daemon/frames.js.map +1 -0
- package/dist/bridge/daemon/openclaw-chat-runtime.d.ts +80 -0
- package/dist/bridge/daemon/openclaw-chat-runtime.js +1222 -0
- package/dist/bridge/daemon/openclaw-chat-runtime.js.map +1 -0
- package/dist/bridge/daemon/openclaw-gateway-client.d.ts +58 -0
- package/dist/bridge/daemon/openclaw-gateway-client.js +251 -0
- package/dist/bridge/daemon/openclaw-gateway-client.js.map +1 -0
- package/dist/bridge/daemon/openclaw-weixin-auth-runtime.d.ts +28 -0
- package/dist/bridge/daemon/openclaw-weixin-auth-runtime.js +266 -0
- package/dist/bridge/daemon/openclaw-weixin-auth-runtime.js.map +1 -0
- package/dist/bridge/daemon/openclaw-weixin-plugin.d.ts +67 -0
- package/dist/bridge/daemon/openclaw-weixin-plugin.js +196 -0
- package/dist/bridge/daemon/openclaw-weixin-plugin.js.map +1 -0
- package/dist/bridge/daemon/relay-client.d.ts +79 -0
- package/dist/bridge/daemon/relay-client.js +396 -0
- package/dist/bridge/daemon/relay-client.js.map +1 -0
- package/dist/bridge/daemon/stub-chat-runtime.d.ts +4 -0
- package/dist/bridge/daemon/stub-chat-runtime.js +91 -0
- package/dist/bridge/daemon/stub-chat-runtime.js.map +1 -0
- package/dist/bridge/service.d.ts +12 -0
- package/dist/bridge/service.js +86 -0
- package/dist/bridge/service.js.map +1 -0
- package/dist/commands/backup.d.ts +16 -0
- package/dist/commands/backup.js +99 -0
- package/dist/commands/backup.js.map +1 -0
- package/dist/commands/bridge.d.ts +7 -0
- package/dist/commands/bridge.js +100 -0
- package/dist/commands/bridge.js.map +1 -0
- package/dist/commands/check.js +22 -6
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/edit.d.ts +2 -7
- package/dist/commands/edit.js +28 -16
- 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 +99 -18
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/migration.d.ts +1 -0
- package/dist/commands/migration.js +205 -0
- package/dist/commands/migration.js.map +1 -0
- package/dist/commands/openclaw-channel-login.d.ts +54 -0
- package/dist/commands/openclaw-channel-login.js +334 -0
- package/dist/commands/openclaw-channel-login.js.map +1 -0
- package/dist/commands/restore.d.ts +16 -0
- package/dist/commands/restore.js +94 -0
- package/dist/commands/restore.js.map +1 -0
- package/dist/commands/service.js +56 -13
- package/dist/commands/service.js.map +1 -1
- package/dist/commands/show.d.ts +13 -0
- package/dist/commands/show.js +70 -0
- package/dist/commands/show.js.map +1 -0
- package/dist/commands/skill.d.ts +1 -0
- package/dist/commands/skill.js +137 -0
- package/dist/commands/skill.js.map +1 -0
- package/dist/commands/uninstall.d.ts +1 -0
- package/dist/commands/uninstall.js +46 -0
- package/dist/commands/uninstall.js.map +1 -0
- package/dist/index.js +116 -12
- package/dist/index.js.map +1 -1
- package/dist/installers/base.d.ts +3 -1
- package/dist/installers/channel.d.ts +10 -2
- package/dist/installers/channel.js +143 -24
- package/dist/installers/channel.js.map +1 -1
- package/dist/installers/openclaw.d.ts +20 -2
- package/dist/installers/openclaw.js +201 -55
- package/dist/installers/openclaw.js.map +1 -1
- package/dist/installers/openviking-purge.d.ts +52 -0
- package/dist/installers/openviking-purge.js +380 -0
- package/dist/installers/openviking-purge.js.map +1 -0
- package/dist/installers/openviking.js +1 -2
- package/dist/installers/openviking.js.map +1 -1
- package/dist/installers/skill.d.ts +5 -2
- package/dist/installers/skill.js +67 -18
- package/dist/installers/skill.js.map +1 -1
- package/dist/migration/archive.d.ts +14 -0
- package/dist/migration/archive.js +84 -0
- package/dist/migration/archive.js.map +1 -0
- package/dist/migration/crypto.d.ts +16 -0
- package/dist/migration/crypto.js +56 -0
- package/dist/migration/crypto.js.map +1 -0
- package/dist/migration/manifest.d.ts +39 -0
- package/dist/migration/manifest.js +140 -0
- package/dist/migration/manifest.js.map +1 -0
- package/dist/openclaw-user-data.d.ts +86 -0
- package/dist/openclaw-user-data.js +422 -0
- package/dist/openclaw-user-data.js.map +1 -0
- 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/constants.d.ts +14 -13
- package/dist/utils/constants.js +40 -21
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/deps.d.ts +34 -3
- package/dist/utils/deps.js +62 -100
- package/dist/utils/deps.js.map +1 -1
- package/dist/utils/install-safety.d.ts +25 -0
- package/dist/utils/install-safety.js +97 -0
- package/dist/utils/install-safety.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 +14 -0
- package/dist/utils/mirror.js.map +1 -1
- package/dist/utils/openclaw-config-cli.d.ts +19 -0
- package/dist/utils/openclaw-config-cli.js +81 -0
- package/dist/utils/openclaw-config-cli.js.map +1 -0
- package/dist/utils/openclaw-daemon.d.ts +58 -0
- package/dist/utils/openclaw-daemon.js +154 -0
- package/dist/utils/openclaw-daemon.js.map +1 -0
- package/dist/utils/shell.d.ts +23 -2
- package/dist/utils/shell.js +138 -5
- package/dist/utils/shell.js.map +1 -1
- package/package.json +6 -4
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { error, info } from '../utils/logger.js';
|
|
2
|
+
import { createOpenclawUserDataArchive, } from '../openclaw-user-data.js';
|
|
3
|
+
export async function backupCommand(args, deps = {}) {
|
|
4
|
+
const parsed = parseBackupArgs(args);
|
|
5
|
+
const emit = deps.emit ?? defaultEmit;
|
|
6
|
+
const createArchive = deps.createArchive ?? createOpenclawUserDataArchive;
|
|
7
|
+
if (parsed.target !== 'openclaw-user-data' || !parsed.archive) {
|
|
8
|
+
error('Usage: okclaw backup openclaw-user-data --archive [--archive-path <path>] [--scope user-data|clone] [--include-workspace-extra] [--output=ndjson]');
|
|
9
|
+
process.exit(1);
|
|
10
|
+
}
|
|
11
|
+
try {
|
|
12
|
+
const result = await createArchive({
|
|
13
|
+
archivePath: parsed.archivePath,
|
|
14
|
+
scope: parsed.scope,
|
|
15
|
+
includeWorkspaceExtra: parsed.includeWorkspaceExtra,
|
|
16
|
+
});
|
|
17
|
+
emit({
|
|
18
|
+
ok: true,
|
|
19
|
+
code: 'OK',
|
|
20
|
+
message: result.archivePath ? 'openclaw user data backup archived' : 'no openclaw user data found',
|
|
21
|
+
backupDir: result.backupDir,
|
|
22
|
+
archivePath: result.archivePath,
|
|
23
|
+
includedFiles: result.includedFiles,
|
|
24
|
+
});
|
|
25
|
+
if (!parsed.ndjson) {
|
|
26
|
+
info(result.archivePath ? `Archived openclaw user data to ${result.archivePath}` : 'No openclaw user data found.');
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
catch (e) {
|
|
30
|
+
const err = e;
|
|
31
|
+
emit({
|
|
32
|
+
ok: false,
|
|
33
|
+
code: 'E_BACKUP_FAILED',
|
|
34
|
+
message: 'openclaw user data backup failed',
|
|
35
|
+
backupDir: err.backupDir,
|
|
36
|
+
archivePath: err.archivePath ?? parsed.archivePath,
|
|
37
|
+
error: err.message,
|
|
38
|
+
});
|
|
39
|
+
throw e;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
function parseBackupArgs(args) {
|
|
43
|
+
let target;
|
|
44
|
+
let archive = false;
|
|
45
|
+
let archivePath;
|
|
46
|
+
let scope = 'user-data';
|
|
47
|
+
let includeWorkspaceExtra = false;
|
|
48
|
+
let ndjson = false;
|
|
49
|
+
for (let i = 0; i < args.length; i++) {
|
|
50
|
+
const arg = args[i];
|
|
51
|
+
if (!target && !arg.startsWith('--')) {
|
|
52
|
+
target = arg;
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
if (arg === '--archive') {
|
|
56
|
+
archive = true;
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
if (arg === '--archive-path' && args[i + 1]) {
|
|
60
|
+
archivePath = args[++i];
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
if (arg.startsWith('--archive-path=')) {
|
|
64
|
+
archivePath = arg.slice('--archive-path='.length);
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
if (arg === '--scope') {
|
|
68
|
+
if (!args[i + 1]) {
|
|
69
|
+
throw new Error('missing value for --scope');
|
|
70
|
+
}
|
|
71
|
+
scope = parseScope(args[++i]);
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
if (arg.startsWith('--scope=')) {
|
|
75
|
+
scope = parseScope(arg.slice('--scope='.length));
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
if (arg === '--include-workspace-extra') {
|
|
79
|
+
includeWorkspaceExtra = true;
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
if (arg === '--output=ndjson' || (arg === '--output' && args[i + 1] === 'ndjson')) {
|
|
83
|
+
ndjson = true;
|
|
84
|
+
if (arg === '--output')
|
|
85
|
+
i += 1;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
return { target, archive, archivePath, scope, includeWorkspaceExtra, ndjson };
|
|
89
|
+
}
|
|
90
|
+
function parseScope(value) {
|
|
91
|
+
if (value === 'user-data' || value === 'clone') {
|
|
92
|
+
return value;
|
|
93
|
+
}
|
|
94
|
+
throw new Error(`unsupported openclaw user data scope: ${value}`);
|
|
95
|
+
}
|
|
96
|
+
function defaultEmit(event) {
|
|
97
|
+
process.stdout.write(JSON.stringify(event) + '\n');
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=backup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/commands/backup.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { type InstallBridgeServiceOptions } from '../bridge/service.js';
|
|
2
|
+
export interface BridgeInstallArgs extends InstallBridgeServiceOptions {
|
|
3
|
+
configPath: string;
|
|
4
|
+
useExistingConfig: boolean;
|
|
5
|
+
}
|
|
6
|
+
export declare function parseBridgeInstallArgs(args: string[]): BridgeInstallArgs;
|
|
7
|
+
export declare function bridgeCommand(args: string[], installedVersion?: string): Promise<void>;
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { error, info, success } from '../utils/logger.js';
|
|
2
|
+
import { probeBridgeServiceActive, restartBridgeService, uninstallBridgeService, } from '../bridge/service.js';
|
|
3
|
+
import { runBridgeDaemon } from '../bridge/daemon/daemon.js';
|
|
4
|
+
import { OKCLAW_BRIDGE_CONFIG } from '../utils/constants.js';
|
|
5
|
+
export function parseBridgeInstallArgs(args) {
|
|
6
|
+
let configFile;
|
|
7
|
+
let configPath = OKCLAW_BRIDGE_CONFIG;
|
|
8
|
+
let useExistingConfig = false;
|
|
9
|
+
for (let i = 1; i < args.length; i++) {
|
|
10
|
+
const arg = args[i];
|
|
11
|
+
if (arg === '--config-file' || arg.startsWith('--config-file=')) {
|
|
12
|
+
configFile = arg.includes('=') ? arg.slice('--config-file='.length) : args[++i];
|
|
13
|
+
continue;
|
|
14
|
+
}
|
|
15
|
+
if (arg === '--config-path' || arg.startsWith('--config-path=')) {
|
|
16
|
+
configPath = arg.includes('=') ? arg.slice('--config-path='.length) : args[++i];
|
|
17
|
+
continue;
|
|
18
|
+
}
|
|
19
|
+
if (arg === '--use-existing-config') {
|
|
20
|
+
useExistingConfig = true;
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
throw new Error('E_BRIDGE_USAGE');
|
|
24
|
+
}
|
|
25
|
+
if (useExistingConfig && configFile) {
|
|
26
|
+
throw new Error('E_BRIDGE_USAGE');
|
|
27
|
+
}
|
|
28
|
+
if (!useExistingConfig && !configFile) {
|
|
29
|
+
throw new Error('E_BRIDGE_USAGE');
|
|
30
|
+
}
|
|
31
|
+
return {
|
|
32
|
+
configFile,
|
|
33
|
+
configPath,
|
|
34
|
+
useExistingConfig,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
export async function bridgeCommand(args, installedVersion = 'unknown') {
|
|
38
|
+
const subcommand = args[0];
|
|
39
|
+
try {
|
|
40
|
+
switch (subcommand) {
|
|
41
|
+
case 'daemon': {
|
|
42
|
+
const client = runBridgeDaemon({ configPath: parseBridgeDaemonArgs(args.slice(1)), installedVersion });
|
|
43
|
+
const shutdown = () => {
|
|
44
|
+
client.close();
|
|
45
|
+
// 给 WebSocket close 帧 / TCP FIN best-effort 刷出的时间,让 relay 侧及时清连接而非等 reaper 超时
|
|
46
|
+
setTimeout(() => process.exit(0), 200);
|
|
47
|
+
};
|
|
48
|
+
process.on('SIGTERM', shutdown);
|
|
49
|
+
process.on('SIGINT', shutdown);
|
|
50
|
+
break;
|
|
51
|
+
}
|
|
52
|
+
case 'restart':
|
|
53
|
+
await restartBridgeService();
|
|
54
|
+
success('Bridge service restarted.');
|
|
55
|
+
break;
|
|
56
|
+
case 'status': {
|
|
57
|
+
const active = await probeBridgeServiceActive();
|
|
58
|
+
info(active ? 'Bridge service active.' : 'Bridge service not running.');
|
|
59
|
+
if (!active)
|
|
60
|
+
process.exit(1);
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
case 'uninstall':
|
|
64
|
+
await uninstallBridgeService();
|
|
65
|
+
success('Bridge service uninstalled.');
|
|
66
|
+
break;
|
|
67
|
+
default:
|
|
68
|
+
printBridgeUsage();
|
|
69
|
+
process.exit(1);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
catch (e) {
|
|
73
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
74
|
+
error(msg);
|
|
75
|
+
process.exit(1);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
function parseBridgeDaemonArgs(args) {
|
|
79
|
+
for (let i = 0; i < args.length; i++) {
|
|
80
|
+
const arg = args[i];
|
|
81
|
+
if (arg === '--config' || arg.startsWith('--config=')) {
|
|
82
|
+
return arg.includes('=') ? arg.slice('--config='.length) : args[++i];
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
throw new Error('E_BRIDGE_CONFIG_MISSING');
|
|
86
|
+
}
|
|
87
|
+
function printBridgeUsage() {
|
|
88
|
+
console.log(`
|
|
89
|
+
Usage:
|
|
90
|
+
okclaw bridge daemon --config /etc/okclaw-bridge/config.json
|
|
91
|
+
okclaw bridge status
|
|
92
|
+
okclaw bridge restart
|
|
93
|
+
okclaw bridge uninstall
|
|
94
|
+
|
|
95
|
+
Install:
|
|
96
|
+
okclaw install bridge --config-file /tmp/okclaw/okclaw-bridge-config.json [--config-path /etc/okclaw-bridge/config.json]
|
|
97
|
+
okclaw install bridge --use-existing-config [--config-path /etc/okclaw-bridge/config.json]
|
|
98
|
+
`);
|
|
99
|
+
}
|
|
100
|
+
//# sourceMappingURL=bridge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../src/commands/bridge.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/check.js
CHANGED
|
@@ -1,11 +1,27 @@
|
|
|
1
|
-
import { ensureNodeVersion
|
|
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
|
-
|
|
9
|
-
|
|
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
|
+
}
|
|
10
26
|
}
|
|
11
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,
|
|
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.d.ts
CHANGED
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
4
|
-
* Copies a file to the openclaw workspace directory.
|
|
5
|
-
* user → ~/.openclaw/workspace/USER.md
|
|
6
|
-
* identity → ~/.openclaw/workspace/IDENTITY.md
|
|
7
|
-
* soul → ~/.openclaw/workspace/SOUL.md
|
|
8
|
-
* agents → ~/.openclaw/workspace/AGENTS.md
|
|
2
|
+
* 7 个受支持的编辑目标:6 个 markdown 位于 workspace,openclaw.json 位于 OPENCLAW_HOME。
|
|
9
3
|
*/
|
|
4
|
+
export declare const TARGETS: Record<string, string>;
|
|
10
5
|
export declare function editCommand(args: string[]): Promise<void>;
|
package/dist/commands/edit.js
CHANGED
|
@@ -1,45 +1,57 @@
|
|
|
1
1
|
import { existsSync, mkdirSync } from 'node:fs';
|
|
2
|
-
import {
|
|
2
|
+
import { dirname } from 'node:path';
|
|
3
|
+
import { runCommand } from '../utils/shell.js';
|
|
3
4
|
import { info, error } from '../utils/logger.js';
|
|
4
|
-
import { OPENCLAW_WORKSPACE } from '../utils/constants.js';
|
|
5
|
+
import { OPENCLAW_HOME, OPENCLAW_WORKSPACE } from '../utils/constants.js';
|
|
6
|
+
import { NdjsonEmitter, registerExitHandlers } from '../output/ndjson.js';
|
|
5
7
|
/**
|
|
6
|
-
*
|
|
8
|
+
* 7 个受支持的编辑目标:6 个 markdown 位于 workspace,openclaw.json 位于 OPENCLAW_HOME。
|
|
7
9
|
*/
|
|
8
|
-
const TARGETS = {
|
|
10
|
+
export const TARGETS = {
|
|
9
11
|
user: `${OPENCLAW_WORKSPACE}/USER.md`,
|
|
10
12
|
identity: `${OPENCLAW_WORKSPACE}/IDENTITY.md`,
|
|
11
13
|
soul: `${OPENCLAW_WORKSPACE}/SOUL.md`,
|
|
12
14
|
agents: `${OPENCLAW_WORKSPACE}/AGENTS.md`,
|
|
13
15
|
memory: `${OPENCLAW_WORKSPACE}/MEMORY.md`,
|
|
16
|
+
tools: `${OPENCLAW_WORKSPACE}/TOOLS.md`,
|
|
17
|
+
'openclaw-json': `${OPENCLAW_HOME}/openclaw.json`,
|
|
14
18
|
};
|
|
15
|
-
/**
|
|
16
|
-
* okclaw edit <target> --file <path>
|
|
17
|
-
*
|
|
18
|
-
* Copies a file to the openclaw workspace directory.
|
|
19
|
-
* user → ~/.openclaw/workspace/USER.md
|
|
20
|
-
* identity → ~/.openclaw/workspace/IDENTITY.md
|
|
21
|
-
* soul → ~/.openclaw/workspace/SOUL.md
|
|
22
|
-
* agents → ~/.openclaw/workspace/AGENTS.md
|
|
23
|
-
*/
|
|
24
19
|
export async function editCommand(args) {
|
|
20
|
+
const emitter = new NdjsonEmitter('file_write');
|
|
21
|
+
registerExitHandlers(emitter);
|
|
25
22
|
const target = args[0];
|
|
26
23
|
if (!target || !TARGETS[target]) {
|
|
27
24
|
error(`Usage: okclaw edit <${Object.keys(TARGETS).join('|')}> --file <path>`);
|
|
25
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
28
26
|
process.exit(1);
|
|
29
27
|
}
|
|
30
28
|
const fileIdx = args.indexOf('--file');
|
|
31
29
|
const filePath = fileIdx >= 0 ? args[fileIdx + 1] : undefined;
|
|
32
30
|
if (!filePath) {
|
|
33
31
|
error('Missing --file argument');
|
|
32
|
+
emitter.end(false, 1, 'E_USAGE');
|
|
34
33
|
process.exit(1);
|
|
35
34
|
}
|
|
36
35
|
if (!existsSync(filePath)) {
|
|
37
36
|
error(`File not found: ${filePath}`);
|
|
37
|
+
emitter.end(false, 1, 'E_SRC_NOT_FOUND');
|
|
38
38
|
process.exit(1);
|
|
39
39
|
}
|
|
40
40
|
const dest = TARGETS[target];
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
emitter.start(`writing ${target}`, { target, dest });
|
|
42
|
+
try {
|
|
43
|
+
emitter.stepStart('write', `copying to ${dest}`);
|
|
44
|
+
mkdirSync(dirname(dest), { recursive: true });
|
|
45
|
+
await runCommand('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
|
+
}
|
|
44
56
|
}
|
|
45
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,
|
|
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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"}
|