@rethinkingstudio/clawpilot 2.1.6 → 2.1.7-beta.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/ccconnect/api-client.d.ts +78 -0
- package/dist/ccconnect/api-client.js +98 -0
- package/dist/ccconnect/api-client.js.map +1 -0
- package/dist/ccconnect/local-runtime.d.ts +15 -0
- package/dist/ccconnect/local-runtime.js +181 -0
- package/dist/ccconnect/local-runtime.js.map +1 -0
- package/dist/ccconnect/project-config.d.ts +25 -0
- package/dist/ccconnect/project-config.js +309 -0
- package/dist/ccconnect/project-config.js.map +1 -0
- package/dist/commands/install.js +1 -0
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/local-handlers.js +46 -0
- package/dist/commands/local-handlers.js.map +1 -1
- package/dist/commands/pair.d.ts +4 -0
- package/dist/commands/pair.js +87 -12
- package/dist/commands/pair.js.map +1 -1
- package/dist/commands/run.js +36 -1
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/session-key.js +5 -2
- package/dist/commands/session-key.js.map +1 -1
- package/dist/commands/status.js +41 -4
- package/dist/commands/status.js.map +1 -1
- package/dist/config/config.d.ts +9 -1
- package/dist/config/config.js +30 -4
- package/dist/config/config.js.map +1 -1
- package/dist/hermes/agent-bridge.js +46 -2
- package/dist/hermes/agent-bridge.js.map +1 -1
- package/dist/hermes/home.d.ts +23 -0
- package/dist/hermes/home.js +250 -0
- package/dist/hermes/home.js.map +1 -0
- package/dist/hermes/model-catalog.js +10 -9
- package/dist/hermes/model-catalog.js.map +1 -1
- package/dist/i18n/index.js +2 -2
- package/dist/i18n/index.js.map +1 -1
- package/dist/index.js +7 -3
- package/dist/index.js.map +1 -1
- package/dist/media/assistant-attachments.d.ts +2 -0
- package/dist/media/assistant-attachments.js +18 -18
- package/dist/media/assistant-attachments.js.map +1 -1
- package/dist/platform/service-manager.js +9 -0
- package/dist/platform/service-manager.js.map +1 -1
- package/dist/relay/agent-status.d.ts +55 -0
- package/dist/relay/agent-status.js +294 -0
- package/dist/relay/agent-status.js.map +1 -0
- package/dist/relay/ccconnect-relay-manager.d.ts +13 -0
- package/dist/relay/ccconnect-relay-manager.js +1105 -0
- package/dist/relay/ccconnect-relay-manager.js.map +1 -0
- package/dist/relay/hermes-relay-manager.js +225 -53
- package/dist/relay/hermes-relay-manager.js.map +1 -1
- package/dist/relay/relay-command-dispatcher.d.ts +14 -0
- package/dist/relay/relay-command-dispatcher.js +25 -0
- package/dist/relay/relay-command-dispatcher.js.map +1 -0
- package/dist/relay/relay-manager.js +60 -29
- package/dist/relay/relay-manager.js.map +1 -1
- package/dist/relay/relay-method-registry.d.ts +9 -0
- package/dist/relay/relay-method-registry.js +61 -0
- package/dist/relay/relay-method-registry.js.map +1 -0
- package/dist/relay/relay-watchdog.d.ts +2 -0
- package/dist/relay/relay-watchdog.js +31 -0
- package/dist/relay/relay-watchdog.js.map +1 -0
- package/package.json +1 -1
- package/scripts/hermes_agent_bridge.py +14 -2
- package/scripts/verify-build-config.mjs +1 -3
package/dist/commands/pair.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import { hostname
|
|
1
|
+
import { hostname } from "os";
|
|
2
2
|
import { execSync } from "child_process";
|
|
3
3
|
import { createInterface } from "readline/promises";
|
|
4
|
-
import { existsSync, readFileSync, writeFileSync } from "fs";
|
|
5
|
-
import { join } from "path";
|
|
4
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
|
|
6
5
|
import { randomBytes } from "crypto";
|
|
7
6
|
import { getManagedServiceInstallHint, getServicePlatform, supportsManagedServiceInstall } from "../platform/service-manager.js";
|
|
8
|
-
import { getOrCreateMachineId, configExists, readConfig, writeConfig } from "../config/config.js";
|
|
7
|
+
import { getOrCreateMachineId, configExists, readConfig, writeConfig, readCCConnectManagementUrl, readCCConnectManagementToken, readCCConnectBridgeUrl, readCCConnectBridgeToken, } from "../config/config.js";
|
|
8
|
+
import { CCConnectManagementClient } from "../ccconnect/api-client.js";
|
|
9
|
+
import { ensureLocalCCConnectRuntime } from "../ccconnect/local-runtime.js";
|
|
10
|
+
import { resolveHermesHome, resolveHermesPath } from "../hermes/home.js";
|
|
9
11
|
function sanitizeDisplayName(name) {
|
|
10
12
|
// Replace smart quotes and other problematic characters with regular ones
|
|
11
13
|
return name
|
|
@@ -34,8 +36,13 @@ function readHermesApiKeyCandidate() {
|
|
|
34
36
|
const direct = process.env.HERMES_API_SERVER_KEY?.trim() || process.env.API_SERVER_KEY?.trim();
|
|
35
37
|
return direct || undefined;
|
|
36
38
|
}
|
|
37
|
-
const HERMES_ENV_PATH = join(homedir(), ".hermes", ".env");
|
|
38
39
|
const DEFAULT_HERMES_API_BASE_URL = "http://127.0.0.1:8642";
|
|
40
|
+
function hermesCommandEnv() {
|
|
41
|
+
return {
|
|
42
|
+
...process.env,
|
|
43
|
+
HERMES_HOME: resolveHermesHome(),
|
|
44
|
+
};
|
|
45
|
+
}
|
|
39
46
|
function parseSimpleEnv(text) {
|
|
40
47
|
const values = new Map();
|
|
41
48
|
for (const rawLine of text.split(/\r?\n/)) {
|
|
@@ -82,7 +89,7 @@ function ensureHermesGatewayInstalled() {
|
|
|
82
89
|
throw new Error(t("pair.hermesCliMissing"));
|
|
83
90
|
}
|
|
84
91
|
try {
|
|
85
|
-
const output = execSync("hermes gateway status", { stdio: "pipe", encoding: "utf8" });
|
|
92
|
+
const output = execSync("hermes gateway status", { stdio: "pipe", encoding: "utf8", env: hermesCommandEnv() });
|
|
86
93
|
const normalized = output.toLowerCase();
|
|
87
94
|
if (normalized.includes("not installed") || normalized.includes("not found")) {
|
|
88
95
|
throw new Error(t("pair.hermesGatewayNotInstalled"));
|
|
@@ -99,7 +106,8 @@ function ensureHermesGatewayInstalled() {
|
|
|
99
106
|
async function ensureHermesApiReady() {
|
|
100
107
|
const baseUrl = DEFAULT_HERMES_API_BASE_URL;
|
|
101
108
|
ensureHermesGatewayInstalled();
|
|
102
|
-
const
|
|
109
|
+
const hermesEnvPath = resolveHermesPath(".env");
|
|
110
|
+
const currentText = existsSync(hermesEnvPath) ? readFileSync(hermesEnvPath, "utf-8") : "";
|
|
103
111
|
const currentEnv = parseSimpleEnv(currentText);
|
|
104
112
|
const configuredApiKey = currentEnv.get("API_SERVER_KEY")?.trim()
|
|
105
113
|
|| currentEnv.get("HERMES_API_SERVER_KEY")?.trim()
|
|
@@ -110,10 +118,11 @@ async function ensureHermesApiReady() {
|
|
|
110
118
|
API_SERVER_KEY: apiKey,
|
|
111
119
|
});
|
|
112
120
|
if (nextText !== currentText) {
|
|
113
|
-
|
|
121
|
+
mkdirSync(resolveHermesHome(), { recursive: true });
|
|
122
|
+
writeFileSync(hermesEnvPath, nextText, "utf-8");
|
|
114
123
|
}
|
|
115
124
|
try {
|
|
116
|
-
execSync("hermes gateway restart", { stdio: "pipe", encoding: "utf8" });
|
|
125
|
+
execSync("hermes gateway restart", { stdio: "pipe", encoding: "utf8", env: hermesCommandEnv() });
|
|
117
126
|
}
|
|
118
127
|
catch (error) {
|
|
119
128
|
const detail = error instanceof Error ? error.message : String(error);
|
|
@@ -139,6 +148,14 @@ async function ensureHermesApiReady() {
|
|
|
139
148
|
}
|
|
140
149
|
async function detectAvailableRuntimes() {
|
|
141
150
|
const runtimes = [];
|
|
151
|
+
try {
|
|
152
|
+
const response = await fetch("http://127.0.0.1:9820/api/v1/status");
|
|
153
|
+
if (response.ok)
|
|
154
|
+
runtimes.push("ccconnect");
|
|
155
|
+
}
|
|
156
|
+
catch {
|
|
157
|
+
// ignore
|
|
158
|
+
}
|
|
142
159
|
try {
|
|
143
160
|
const gatewayUrl = "http://127.0.0.1:8642/health";
|
|
144
161
|
const response = await fetch(gatewayUrl);
|
|
@@ -148,6 +165,7 @@ async function detectAvailableRuntimes() {
|
|
|
148
165
|
catch {
|
|
149
166
|
// ignore
|
|
150
167
|
}
|
|
168
|
+
runtimes.push("ccconnect");
|
|
151
169
|
runtimes.push("openclaw");
|
|
152
170
|
return [...new Set(runtimes)];
|
|
153
171
|
}
|
|
@@ -161,21 +179,69 @@ async function pickRuntime(preferred) {
|
|
|
161
179
|
try {
|
|
162
180
|
console.log(t("pair.runtimePrompt"));
|
|
163
181
|
runtimes.forEach((runtime, index) => {
|
|
164
|
-
console.log(` ${index + 1}. ${runtime
|
|
182
|
+
console.log(` ${index + 1}. ${runtimeDisplayName(runtime)}`);
|
|
165
183
|
});
|
|
166
184
|
const answer = (await rl.question("> ")).trim();
|
|
167
185
|
const byIndex = Number.parseInt(answer, 10);
|
|
168
186
|
if (Number.isFinite(byIndex) && byIndex >= 1 && byIndex <= runtimes.length) {
|
|
169
187
|
return runtimes[byIndex - 1];
|
|
170
188
|
}
|
|
171
|
-
|
|
189
|
+
const lower = answer.toLowerCase();
|
|
190
|
+
return lower === "hermes" ? "hermes" : lower === "ccconnect" || lower === "cc-connect" ? "ccconnect" : "openclaw";
|
|
172
191
|
}
|
|
173
192
|
finally {
|
|
174
193
|
rl.close();
|
|
175
194
|
}
|
|
176
195
|
}
|
|
177
196
|
function defaultDisplayName(runtimeType) {
|
|
178
|
-
return `${getDisplayName()} · ${runtimeType
|
|
197
|
+
return `${getDisplayName()} · ${runtimeDisplayName(runtimeType)}`;
|
|
198
|
+
}
|
|
199
|
+
function runtimeDisplayName(runtimeType) {
|
|
200
|
+
if (runtimeType === "hermes")
|
|
201
|
+
return "Hermes";
|
|
202
|
+
if (runtimeType === "ccconnect")
|
|
203
|
+
return "cc-connect";
|
|
204
|
+
return "OpenClaw";
|
|
205
|
+
}
|
|
206
|
+
async function ensureCCConnectReady(opts) {
|
|
207
|
+
const probeConfig = {
|
|
208
|
+
relayServerUrl: "",
|
|
209
|
+
gatewayId: "",
|
|
210
|
+
relaySecret: "",
|
|
211
|
+
displayName: "",
|
|
212
|
+
runtimeType: "ccconnect",
|
|
213
|
+
ccconnectManagementUrl: opts.ccconnectManagementUrl,
|
|
214
|
+
ccconnectManagementToken: opts.ccconnectManagementToken,
|
|
215
|
+
ccconnectBridgeUrl: opts.ccconnectBridgeUrl,
|
|
216
|
+
ccconnectBridgeToken: opts.ccconnectBridgeToken,
|
|
217
|
+
};
|
|
218
|
+
const managementUrl = readCCConnectManagementUrl(probeConfig);
|
|
219
|
+
const managementToken = readCCConnectManagementToken(probeConfig);
|
|
220
|
+
const runtime = await ensureLocalCCConnectRuntime({
|
|
221
|
+
managementUrl,
|
|
222
|
+
managementToken,
|
|
223
|
+
bridgeUrl: opts.ccconnectBridgeUrl,
|
|
224
|
+
bridgeToken: opts.ccconnectBridgeToken,
|
|
225
|
+
});
|
|
226
|
+
const client = new CCConnectManagementClient({
|
|
227
|
+
managementUrl: runtime.managementUrl,
|
|
228
|
+
managementToken: runtime.managementToken,
|
|
229
|
+
});
|
|
230
|
+
const status = await client.status();
|
|
231
|
+
await client.listProjects();
|
|
232
|
+
const statusBridge = status.bridge;
|
|
233
|
+
const bridgePath = statusBridge?.path || "/bridge/ws";
|
|
234
|
+
const bridgePort = statusBridge?.port || 9810;
|
|
235
|
+
const bridgeUrl = opts.ccconnectBridgeUrl?.trim()
|
|
236
|
+
|| readCCConnectBridgeUrl({
|
|
237
|
+
...probeConfig,
|
|
238
|
+
ccconnectBridgeUrl: `ws://127.0.0.1:${bridgePort}${bridgePath}`,
|
|
239
|
+
});
|
|
240
|
+
const bridgeToken = opts.ccconnectBridgeToken?.trim()
|
|
241
|
+
|| statusBridge?.token
|
|
242
|
+
|| runtime.bridgeToken
|
|
243
|
+
|| readCCConnectBridgeToken(probeConfig);
|
|
244
|
+
return { managementUrl: runtime.managementUrl, managementToken: runtime.managementToken, bridgeUrl, bridgeToken };
|
|
179
245
|
}
|
|
180
246
|
export async function pairCommand(opts) {
|
|
181
247
|
const runtimeType = await pickRuntime(opts.runtime);
|
|
@@ -184,6 +250,7 @@ export async function pairCommand(opts) {
|
|
|
184
250
|
const machineId = getOrCreateMachineId();
|
|
185
251
|
const runtimeKey = runtimeType;
|
|
186
252
|
const hermesReady = runtimeType === "hermes" ? await ensureHermesApiReady() : undefined;
|
|
253
|
+
const ccconnectReady = runtimeType === "ccconnect" ? await ensureCCConnectReady(opts) : undefined;
|
|
187
254
|
let gatewayId;
|
|
188
255
|
let relaySecret;
|
|
189
256
|
let accessCode;
|
|
@@ -217,6 +284,10 @@ export async function pairCommand(opts) {
|
|
|
217
284
|
runtimeKey,
|
|
218
285
|
hermesApiBaseUrl: runtimeType === "hermes" ? (hermesReady?.baseUrl ?? config.hermesApiBaseUrl ?? DEFAULT_HERMES_API_BASE_URL) : config.hermesApiBaseUrl,
|
|
219
286
|
hermesApiKey: runtimeType === "hermes" ? (hermesReady?.apiKey ?? config.hermesApiKey ?? readHermesApiKeyCandidate()) : config.hermesApiKey,
|
|
287
|
+
ccconnectManagementUrl: runtimeType === "ccconnect" ? (ccconnectReady?.managementUrl ?? config.ccconnectManagementUrl) : config.ccconnectManagementUrl,
|
|
288
|
+
ccconnectManagementToken: runtimeType === "ccconnect" ? (ccconnectReady?.managementToken ?? config.ccconnectManagementToken) : config.ccconnectManagementToken,
|
|
289
|
+
ccconnectBridgeUrl: runtimeType === "ccconnect" ? (ccconnectReady?.bridgeUrl ?? config.ccconnectBridgeUrl) : config.ccconnectBridgeUrl,
|
|
290
|
+
ccconnectBridgeToken: runtimeType === "ccconnect" ? (ccconnectReady?.bridgeToken ?? config.ccconnectBridgeToken) : config.ccconnectBridgeToken,
|
|
220
291
|
});
|
|
221
292
|
}
|
|
222
293
|
else {
|
|
@@ -245,6 +316,10 @@ export async function pairCommand(opts) {
|
|
|
245
316
|
runtimeKey,
|
|
246
317
|
hermesApiBaseUrl: runtimeType === "hermes" ? (hermesReady?.baseUrl ?? DEFAULT_HERMES_API_BASE_URL) : undefined,
|
|
247
318
|
hermesApiKey: runtimeType === "hermes" ? (hermesReady?.apiKey ?? readHermesApiKeyCandidate()) : undefined,
|
|
319
|
+
ccconnectManagementUrl: runtimeType === "ccconnect" ? ccconnectReady?.managementUrl : undefined,
|
|
320
|
+
ccconnectManagementToken: runtimeType === "ccconnect" ? ccconnectReady?.managementToken : undefined,
|
|
321
|
+
ccconnectBridgeUrl: runtimeType === "ccconnect" ? ccconnectReady?.bridgeUrl : undefined,
|
|
322
|
+
ccconnectBridgeToken: runtimeType === "ccconnect" ? ccconnectReady?.bridgeToken : undefined,
|
|
248
323
|
});
|
|
249
324
|
console.log(t("pair.registered", gatewayId));
|
|
250
325
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../src/commands/pair.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../src/commands/pair.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/run.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { listConfigs, readConfig, readGatewayUrl, readGatewayAuth, readHermesApiBaseUrl, readHermesApiKey } from "../config/config.js";
|
|
1
|
+
import { listConfigs, readConfig, readGatewayUrl, readGatewayAuth, readHermesApiBaseUrl, readHermesApiKey, readCCConnectManagementUrl, readCCConnectManagementToken, readCCConnectBridgeUrl, readCCConnectBridgeToken, } from "../config/config.js";
|
|
2
|
+
import { runCCConnectRelayManager } from "../relay/ccconnect-relay-manager.js";
|
|
3
|
+
import { ensureLocalCCConnectRuntime } from "../ccconnect/local-runtime.js";
|
|
2
4
|
import { runHermesRelayManager } from "../relay/hermes-relay-manager.js";
|
|
3
5
|
import { runRelayManager } from "../relay/relay-manager.js";
|
|
4
6
|
import { withReconnect } from "../relay/reconnect.js";
|
|
@@ -12,6 +14,10 @@ export async function runCommand() {
|
|
|
12
14
|
return;
|
|
13
15
|
}
|
|
14
16
|
const tasks = configs.map(async (config) => {
|
|
17
|
+
if ((config.runtimeType ?? "openclaw") === "ccconnect") {
|
|
18
|
+
await runCCConnectConfig(config);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
15
21
|
if ((config.runtimeType ?? "openclaw") === "hermes") {
|
|
16
22
|
await runHermesConfig(config);
|
|
17
23
|
return;
|
|
@@ -20,6 +26,35 @@ export async function runCommand() {
|
|
|
20
26
|
});
|
|
21
27
|
await Promise.all(tasks);
|
|
22
28
|
}
|
|
29
|
+
async function runCCConnectConfig(config) {
|
|
30
|
+
const runtime = await ensureLocalCCConnectRuntime({
|
|
31
|
+
managementUrl: readCCConnectManagementUrl(config),
|
|
32
|
+
managementToken: readCCConnectManagementToken(config),
|
|
33
|
+
bridgeUrl: readCCConnectBridgeUrl(config),
|
|
34
|
+
bridgeToken: readCCConnectBridgeToken(config),
|
|
35
|
+
});
|
|
36
|
+
const managementUrl = runtime.managementUrl;
|
|
37
|
+
const bridgeUrl = runtime.bridgeUrl;
|
|
38
|
+
console.log(t("run.gatewayId", config.gatewayId));
|
|
39
|
+
console.log(t("run.relayServer", config.relayServerUrl));
|
|
40
|
+
console.log(`[runtime] cc-connect Management API: ${managementUrl}`);
|
|
41
|
+
console.log(`[runtime] cc-connect Bridge: ${bridgeUrl}`);
|
|
42
|
+
await withReconnect(() => runCCConnectRelayManager({
|
|
43
|
+
relayServerUrl: config.relayServerUrl,
|
|
44
|
+
gatewayId: config.gatewayId,
|
|
45
|
+
relaySecret: config.relaySecret,
|
|
46
|
+
managementUrl,
|
|
47
|
+
managementToken: runtime.managementToken,
|
|
48
|
+
bridgeUrl,
|
|
49
|
+
bridgeToken: runtime.bridgeToken,
|
|
50
|
+
onConnected: () => console.log("[runtime:ccconnect] relay connected"),
|
|
51
|
+
onDisconnected: () => console.log("[runtime:ccconnect] relay disconnected"),
|
|
52
|
+
}), {
|
|
53
|
+
onRetry: (attempt, delayMs) => {
|
|
54
|
+
console.log(t("run.retry", String(attempt), String(delayMs)));
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
}
|
|
23
58
|
async function runHermesConfig(config) {
|
|
24
59
|
const hermesApiBaseUrl = readHermesApiBaseUrl(config);
|
|
25
60
|
const hermesApiKey = readHermesApiKey(config);
|
package/dist/commands/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ function resolveHermesSessionKey() {
|
|
|
65
65
|
return directSessions[0]?.sessionKey ?? "agent:main:main";
|
|
66
66
|
}
|
|
67
67
|
function normalizeRuntimeType(runtimeType) {
|
|
68
|
-
return runtimeType === "hermes" ? "hermes" : "openclaw";
|
|
68
|
+
return runtimeType === "hermes" ? "hermes" : runtimeType === "ccconnect" ? "ccconnect" : "openclaw";
|
|
69
69
|
}
|
|
70
70
|
export function resolveSyntheticMessageRuntime(requestedRuntime) {
|
|
71
71
|
if (requestedRuntime) {
|
|
@@ -78,9 +78,12 @@ export function resolveSyntheticMessageRuntime(requestedRuntime) {
|
|
|
78
78
|
if (runtimes.length === 1) {
|
|
79
79
|
return runtimes[0];
|
|
80
80
|
}
|
|
81
|
-
throw new Error("Multiple runtimes are paired. Re-run with --runtime openclaw or --runtime
|
|
81
|
+
throw new Error("Multiple runtimes are paired. Re-run with --runtime openclaw, --runtime hermes, or --runtime ccconnect.");
|
|
82
82
|
}
|
|
83
83
|
export function resolveSessionKeyForRuntime(runtimeType) {
|
|
84
|
+
if (runtimeType === "ccconnect") {
|
|
85
|
+
throw new Error("cc-connect requires an explicit --session-key.");
|
|
86
|
+
}
|
|
84
87
|
return runtimeType === "hermes"
|
|
85
88
|
? resolveHermesSessionKey()
|
|
86
89
|
: resolveOpenclawSessionKeyFromStatus();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-key.js","sourceRoot":"","sources":["../../src/commands/session-key.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session-key.js","sourceRoot":"","sources":["../../src/commands/session-key.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/status.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from "fs";
|
|
2
2
|
import { checkHermesHealth } from "../hermes/api-client.js";
|
|
3
|
-
import { listConfigs, readGatewayUrl, readHermesApiBaseUrl, readHermesApiKey } from "../config/config.js";
|
|
3
|
+
import { listConfigs, readGatewayUrl, readHermesApiBaseUrl, readHermesApiKey, readCCConnectManagementUrl, readCCConnectManagementToken, } from "../config/config.js";
|
|
4
|
+
import { CCConnectManagementClient } from "../ccconnect/api-client.js";
|
|
4
5
|
import { t } from "../i18n/index.js";
|
|
5
6
|
import { getServiceStatus } from "../platform/service-manager.js";
|
|
6
7
|
export async function statusCommand() {
|
|
@@ -45,9 +46,12 @@ export async function statusCommand() {
|
|
|
45
46
|
console.log(t("status.gateway", readGatewayUrl()));
|
|
46
47
|
console.log(formatHealthLine("status.gatewayHealth", health.openclawGateway));
|
|
47
48
|
}
|
|
48
|
-
else {
|
|
49
|
+
else if (runtime === "hermes") {
|
|
49
50
|
console.log(formatHealthLine("status.hermesApiHealth", health.hermesApi));
|
|
50
51
|
}
|
|
52
|
+
else {
|
|
53
|
+
console.log(` cc-connect API: ${formatHealth(health.ccconnectApi)}`);
|
|
54
|
+
}
|
|
51
55
|
}
|
|
52
56
|
}
|
|
53
57
|
else {
|
|
@@ -69,14 +73,20 @@ async function readHealth(logPath, configs) {
|
|
|
69
73
|
const hermesApi = hermesConfig
|
|
70
74
|
? await probeHermesApiHealth(hermesConfig)
|
|
71
75
|
: { kind: "unknown", detail: "not configured" };
|
|
76
|
+
const ccconnectConfig = configs.find((config) => (config.runtimeType ?? "openclaw") === "ccconnect");
|
|
77
|
+
const ccconnectApi = ccconnectConfig
|
|
78
|
+
? await probeCCConnectApiHealth(ccconnectConfig)
|
|
79
|
+
: { kind: "unknown", detail: "not configured" };
|
|
72
80
|
if (!existsSync(logPath)) {
|
|
73
81
|
return {
|
|
74
82
|
relay: {
|
|
75
83
|
openclaw: { kind: "unknown", detail: "log missing" },
|
|
76
84
|
hermes: { kind: "unknown", detail: "log missing" },
|
|
85
|
+
ccconnect: { kind: "unknown", detail: "log missing" },
|
|
77
86
|
},
|
|
78
87
|
openclawGateway: { kind: "unknown", detail: "log missing" },
|
|
79
88
|
hermesApi,
|
|
89
|
+
ccconnectApi,
|
|
80
90
|
};
|
|
81
91
|
}
|
|
82
92
|
const lines = readCurrentRunLines(logPath, 800);
|
|
@@ -84,9 +94,11 @@ async function readHealth(logPath, configs) {
|
|
|
84
94
|
relay: {
|
|
85
95
|
openclaw: parseRuntimeRelayHealth(lines, "openclaw"),
|
|
86
96
|
hermes: parseRuntimeRelayHealth(lines, "hermes"),
|
|
97
|
+
ccconnect: parseRuntimeRelayHealth(lines, "ccconnect"),
|
|
87
98
|
},
|
|
88
99
|
openclawGateway: parseGatewayHealth(lines),
|
|
89
100
|
hermesApi,
|
|
101
|
+
ccconnectApi,
|
|
90
102
|
};
|
|
91
103
|
}
|
|
92
104
|
function readTailLines(path, maxLines) {
|
|
@@ -104,7 +116,9 @@ function readCurrentRunLines(path, maxLines) {
|
|
|
104
116
|
function parseRuntimeRelayHealth(lines, runtime) {
|
|
105
117
|
const connectedMarker = `[runtime:${runtime}] relay connected`;
|
|
106
118
|
const disconnectedMarker = `[runtime:${runtime}] relay disconnected`;
|
|
107
|
-
const errorMarker = runtime === "hermes"
|
|
119
|
+
const errorMarker = runtime === "hermes"
|
|
120
|
+
? "Hermes relay WebSocket error:"
|
|
121
|
+
: runtime === "ccconnect" ? "cc-connect relay WebSocket error:" : "Relay WebSocket error:";
|
|
108
122
|
const connectedIndex = findLastIndex(lines, (line) => line.includes(connectedMarker));
|
|
109
123
|
const disconnectedIndex = findLastIndex(lines, (line) => line.includes(disconnectedMarker));
|
|
110
124
|
const errorIndex = findLastIndex(lines, (line) => line.includes(errorMarker));
|
|
@@ -161,6 +175,22 @@ async function probeHermesApiHealth(config) {
|
|
|
161
175
|
};
|
|
162
176
|
}
|
|
163
177
|
}
|
|
178
|
+
async function probeCCConnectApiHealth(config) {
|
|
179
|
+
try {
|
|
180
|
+
const client = new CCConnectManagementClient({
|
|
181
|
+
managementUrl: readCCConnectManagementUrl(config),
|
|
182
|
+
managementToken: readCCConnectManagementToken(config),
|
|
183
|
+
});
|
|
184
|
+
await client.status();
|
|
185
|
+
return { kind: "ok", detail: "connected" };
|
|
186
|
+
}
|
|
187
|
+
catch (error) {
|
|
188
|
+
return {
|
|
189
|
+
kind: "error",
|
|
190
|
+
detail: error instanceof Error ? error.message : String(error),
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
}
|
|
164
194
|
function classifyGatewayDetail(line) {
|
|
165
195
|
const detail = line.toLowerCase();
|
|
166
196
|
if (detail.includes("unauthorized") || detail.includes("mismatch") || detail.includes("not allowed")) {
|
|
@@ -179,10 +209,17 @@ function findLastIndex(lines, predicate) {
|
|
|
179
209
|
return -1;
|
|
180
210
|
}
|
|
181
211
|
function formatHealthLine(key, state) {
|
|
212
|
+
return t(key, ...formatHealthParts(state));
|
|
213
|
+
}
|
|
214
|
+
function formatHealth(state) {
|
|
215
|
+
const [icon, detail] = formatHealthParts(state);
|
|
216
|
+
return `${icon} ${detail}`;
|
|
217
|
+
}
|
|
218
|
+
function formatHealthParts(state) {
|
|
182
219
|
const icon = state.kind === "ok" ? "✓"
|
|
183
220
|
: state.kind === "warn" ? "⚠"
|
|
184
221
|
: state.kind === "error" ? "✗"
|
|
185
222
|
: "-";
|
|
186
|
-
return
|
|
223
|
+
return [icon, state.detail ?? ""];
|
|
187
224
|
}
|
|
188
225
|
//# sourceMappingURL=status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}
|
package/dist/config/config.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type RuntimeType = "openclaw" | "hermes";
|
|
1
|
+
export type RuntimeType = "openclaw" | "hermes" | "ccconnect";
|
|
2
2
|
export interface ClawaiConfig {
|
|
3
3
|
runtimeType?: RuntimeType;
|
|
4
4
|
machineId?: string;
|
|
@@ -9,6 +9,10 @@ export interface ClawaiConfig {
|
|
|
9
9
|
displayName: string;
|
|
10
10
|
hermesApiBaseUrl?: string;
|
|
11
11
|
hermesApiKey?: string;
|
|
12
|
+
ccconnectManagementUrl?: string;
|
|
13
|
+
ccconnectManagementToken?: string;
|
|
14
|
+
ccconnectBridgeUrl?: string;
|
|
15
|
+
ccconnectBridgeToken?: string;
|
|
12
16
|
/** Shared token for the local OpenClaw Gateway (gateway.auth.token in openclaw config). */
|
|
13
17
|
gatewayToken?: string;
|
|
14
18
|
/** Password for the local OpenClaw Gateway (used when auth mode is "password"). */
|
|
@@ -33,3 +37,7 @@ export declare function readGatewayAuth(cfg: ClawaiConfig): {
|
|
|
33
37
|
token?: string;
|
|
34
38
|
password?: string;
|
|
35
39
|
};
|
|
40
|
+
export declare function readCCConnectManagementUrl(cfg: ClawaiConfig): string;
|
|
41
|
+
export declare function readCCConnectManagementToken(cfg: ClawaiConfig): string | undefined;
|
|
42
|
+
export declare function readCCConnectBridgeUrl(cfg: ClawaiConfig): string;
|
|
43
|
+
export declare function readCCConnectBridgeToken(cfg: ClawaiConfig): string | undefined;
|
package/dist/config/config.js
CHANGED
|
@@ -3,6 +3,7 @@ import { join } from "path";
|
|
|
3
3
|
import { homedir } from "os";
|
|
4
4
|
import { randomUUID } from "crypto";
|
|
5
5
|
import { resolveOpenclawConfigPath } from "../commands/openclaw-cli.js";
|
|
6
|
+
import { resolveHermesPath } from "../hermes/home.js";
|
|
6
7
|
const CONFIG_DIR = join(homedir(), ".clawai");
|
|
7
8
|
const RUNTIME_CONFIG_DIR = join(CONFIG_DIR, "runtimes");
|
|
8
9
|
const LEGACY_CONFIG_PATH = join(CONFIG_DIR, "config.json");
|
|
@@ -20,7 +21,7 @@ export function readHermesApiKey(cfg) {
|
|
|
20
21
|
if (envValue)
|
|
21
22
|
return envValue;
|
|
22
23
|
try {
|
|
23
|
-
const envPath =
|
|
24
|
+
const envPath = resolveHermesPath(".env");
|
|
24
25
|
if (!existsSync(envPath))
|
|
25
26
|
return undefined;
|
|
26
27
|
const raw = readFileSync(envPath, "utf-8");
|
|
@@ -44,7 +45,7 @@ export function readHermesApiKey(cfg) {
|
|
|
44
45
|
return undefined;
|
|
45
46
|
}
|
|
46
47
|
function normalizeRuntimeType(runtimeType) {
|
|
47
|
-
return runtimeType === "hermes" ? "hermes" : "openclaw";
|
|
48
|
+
return runtimeType === "hermes" ? "hermes" : runtimeType === "ccconnect" ? "ccconnect" : "openclaw";
|
|
48
49
|
}
|
|
49
50
|
function runtimeConfigPath(runtimeType) {
|
|
50
51
|
return join(RUNTIME_CONFIG_DIR, `${runtimeType}.json`);
|
|
@@ -68,7 +69,7 @@ export function listConfigs() {
|
|
|
68
69
|
// ignore legacy parse failure
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
|
-
for (const runtimeType of ["openclaw", "hermes"]) {
|
|
72
|
+
for (const runtimeType of ["openclaw", "hermes", "ccconnect"]) {
|
|
72
73
|
const path = runtimeConfigPath(runtimeType);
|
|
73
74
|
if (!existsSync(path))
|
|
74
75
|
continue;
|
|
@@ -112,7 +113,7 @@ export function writeConfig(config) {
|
|
|
112
113
|
}
|
|
113
114
|
export function removeAllConfigs() {
|
|
114
115
|
const removed = [];
|
|
115
|
-
for (const path of [LEGACY_CONFIG_PATH, runtimeConfigPath("openclaw"), runtimeConfigPath("hermes")]) {
|
|
116
|
+
for (const path of [LEGACY_CONFIG_PATH, runtimeConfigPath("openclaw"), runtimeConfigPath("hermes"), runtimeConfigPath("ccconnect")]) {
|
|
116
117
|
if (existsSync(path)) {
|
|
117
118
|
try {
|
|
118
119
|
unlinkSync(path);
|
|
@@ -224,4 +225,29 @@ export function readGatewayAuth(cfg) {
|
|
|
224
225
|
}
|
|
225
226
|
return {};
|
|
226
227
|
}
|
|
228
|
+
export function readCCConnectManagementUrl(cfg) {
|
|
229
|
+
return trimTrailingSlash(trimToUndefined(cfg.ccconnectManagementUrl)
|
|
230
|
+
?? trimToUndefined(process.env.CCCONNECT_MANAGEMENT_URL)
|
|
231
|
+
?? "http://127.0.0.1:9820");
|
|
232
|
+
}
|
|
233
|
+
export function readCCConnectManagementToken(cfg) {
|
|
234
|
+
return trimToUndefined(cfg.ccconnectManagementToken)
|
|
235
|
+
?? trimToUndefined(process.env.CCCONNECT_MANAGEMENT_TOKEN)
|
|
236
|
+
?? trimToUndefined(process.env.CC_CONNECT_MANAGEMENT_TOKEN);
|
|
237
|
+
}
|
|
238
|
+
export function readCCConnectBridgeUrl(cfg) {
|
|
239
|
+
const direct = trimToUndefined(cfg.ccconnectBridgeUrl)
|
|
240
|
+
?? trimToUndefined(process.env.CCCONNECT_BRIDGE_URL)
|
|
241
|
+
?? trimToUndefined(process.env.CC_CONNECT_BRIDGE_URL)
|
|
242
|
+
?? "ws://127.0.0.1:9810/bridge/ws";
|
|
243
|
+
return direct.replace(/\/+$/, "");
|
|
244
|
+
}
|
|
245
|
+
export function readCCConnectBridgeToken(cfg) {
|
|
246
|
+
return trimToUndefined(cfg.ccconnectBridgeToken)
|
|
247
|
+
?? trimToUndefined(process.env.CCCONNECT_BRIDGE_TOKEN)
|
|
248
|
+
?? trimToUndefined(process.env.CC_CONNECT_BRIDGE_TOKEN);
|
|
249
|
+
}
|
|
250
|
+
function trimTrailingSlash(value) {
|
|
251
|
+
return value.replace(/\/+$/, "");
|
|
252
|
+
}
|
|
227
253
|
//# sourceMappingURL=config.js.map
|