@openclaw-cloud/agent-controller 0.19.0-beta.2 → 0.19.0-beta.21
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/install-deps.js +1 -7
- package/dist/commands/install-deps.js.map +1 -1
- package/dist/commands/self-update.js +29 -18
- package/dist/commands/self-update.js.map +1 -1
- package/dist/config-file.js +1 -1
- package/dist/config-file.js.map +1 -1
- package/dist/connection.d.ts +3 -0
- package/dist/connection.js +21 -7
- package/dist/connection.js.map +1 -1
- package/dist/handlers/backup.js +2 -0
- package/dist/handlers/backup.js.map +1 -1
- package/dist/handlers/file-delete.js +2 -0
- package/dist/handlers/file-delete.js.map +1 -1
- package/dist/handlers/file-write.js +2 -0
- package/dist/handlers/file-write.js.map +1 -1
- package/dist/handlers/package-install.js +2 -0
- package/dist/handlers/package-install.js.map +1 -1
- package/dist/handlers/restart.js +3 -1
- package/dist/handlers/restart.js.map +1 -1
- package/dist/handlers/self-update.js +2 -0
- package/dist/handlers/self-update.js.map +1 -1
- package/dist/handlers/update-config.d.ts +3 -0
- package/dist/handlers/update-config.js +22 -0
- package/dist/handlers/update-config.js.map +1 -0
- package/dist/handlers/update-skills.js +2 -0
- package/dist/handlers/update-skills.js.map +1 -1
- package/dist/heartbeat.js +62 -2
- package/dist/heartbeat.js.map +1 -1
- package/dist/index.js +17 -16
- package/dist/index.js.map +1 -1
- package/dist/lockfile.js +12 -3
- package/dist/lockfile.js.map +1 -1
- package/dist/providers/chat-types.d.ts +19 -2
- package/dist/providers/index.d.ts +1 -1
- package/dist/providers/openclaw/device-identity.d.ts +20 -0
- package/dist/providers/openclaw/device-identity.js +76 -0
- package/dist/providers/openclaw/device-identity.js.map +1 -0
- package/dist/providers/openclaw/gateway-adapter.d.ts +7 -1
- package/dist/providers/openclaw/gateway-adapter.js +140 -8
- package/dist/providers/openclaw/gateway-adapter.js.map +1 -1
- package/dist/providers/openclaw/gateway-client.d.ts +5 -0
- package/dist/providers/openclaw/gateway-client.js +59 -2
- package/dist/providers/openclaw/gateway-client.js.map +1 -1
- package/dist/providers/types.d.ts +2 -2
- package/dist/types.d.ts +1 -1
- package/dist/utils/apply-config.d.ts +9 -0
- package/dist/utils/apply-config.js +120 -0
- package/dist/utils/apply-config.js.map +1 -0
- package/dist/utils/claude-env.js +34 -46
- package/dist/utils/claude-env.js.map +1 -1
- package/dist/utils/log-collector.d.ts +23 -0
- package/dist/utils/log-collector.js +56 -0
- package/dist/utils/log-collector.js.map +1 -0
- package/dist/utils/release-channel.d.ts +1 -1
- package/dist/utils/release-channel.js +1 -1
- package/dist/utils/release-channel.js.map +1 -1
- package/package.json +1 -1
- package/dist/handlers/config.d.ts +0 -2
- package/dist/handlers/config.js +0 -50
- package/dist/handlers/config.js.map +0 -1
- package/dist/handlers/update-auth-profiles.d.ts +0 -2
- package/dist/handlers/update-auth-profiles.js +0 -67
- package/dist/handlers/update-auth-profiles.js.map +0 -1
- package/dist/handlers/update-env.d.ts +0 -2
- package/dist/handlers/update-env.js +0 -54
- package/dist/handlers/update-env.js.map +0 -1
- package/dist/openclaw/gateway-adapter.d.ts +0 -5
- package/dist/openclaw/gateway-adapter.js +0 -6
- package/dist/openclaw/gateway-adapter.js.map +0 -1
- package/dist/openclaw/gateway-client.d.ts +0 -21
- package/dist/openclaw/gateway-client.js +0 -138
- package/dist/openclaw/gateway-client.js.map +0 -1
- package/dist/openclaw/index.d.ts +0 -20
- package/dist/openclaw/index.js +0 -45
- package/dist/openclaw/index.js.map +0 -1
- package/dist/openclaw/types.d.ts +0 -5
- package/dist/openclaw/types.js +0 -2
- package/dist/openclaw/types.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-client.js","sourceRoot":"","sources":["../../../src/providers/openclaw/gateway-client.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"gateway-client.js","sourceRoot":"","sources":["../../../src/providers/openclaw/gateway-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ChatSession, ChatMessage, ChatAttachment } from './chat-types.js';
|
|
2
|
-
export type { ChatSession, ChatMessage, ChatAttachment };
|
|
1
|
+
import type { ChatSession, ChatMessage, ChatAttachment, ChatContentBlock } from './chat-types.js';
|
|
2
|
+
export type { ChatSession, ChatMessage, ChatAttachment, ChatContentBlock };
|
|
3
3
|
export interface AgentHealthStatus {
|
|
4
4
|
ok: boolean;
|
|
5
5
|
rpcOk: boolean;
|
package/dist/types.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* board:<workspaceId> — board events (card:entered, card:moved, etc.)
|
|
6
6
|
* heartbeat:<agentId> — heartbeat publications from agent
|
|
7
7
|
*/
|
|
8
|
-
export type CommandType = 'diagnostics' | 'restart' | 'deploy' | '
|
|
8
|
+
export type CommandType = 'diagnostics' | 'restart' | 'deploy' | 'pair' | 'stop' | 'backup' | 'chat_list_sessions' | 'chat_history' | 'chat_send' | 'package_install' | 'file_write' | 'file_delete' | 'onboarding_complete' | 'knowledge_sync' | 'self_update' | 'telegram_webhook' | 'update_skills' | 'update_config';
|
|
9
9
|
export interface AgentCommand {
|
|
10
10
|
id: string;
|
|
11
11
|
type: CommandType;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { BootstrapResult } from '../api.js';
|
|
2
|
+
/**
|
|
3
|
+
* Apply config from bootstrap API response:
|
|
4
|
+
* 1. Write openclaw.json
|
|
5
|
+
* 2. Write auth-profiles.json + settings.json (from envVars)
|
|
6
|
+
* 3. Write .env (for VM agents)
|
|
7
|
+
* 4. Restart gateway
|
|
8
|
+
*/
|
|
9
|
+
export declare function applyBootstrapConfig(data: BootstrapResult): Promise<void>;
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import fs from 'node:fs/promises';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import { writeClaudeEnv } from './claude-env.js';
|
|
5
|
+
import { restartGateway } from './gateway-restart.js';
|
|
6
|
+
import { VM_ENV_PATH } from '../config-file.js';
|
|
7
|
+
function getOpenclawDir() {
|
|
8
|
+
return process.env.OPENCLAW_STATE_DIR?.trim() || path.join(os.homedir(), '.openclaw');
|
|
9
|
+
}
|
|
10
|
+
function getAuthProfilesPath() {
|
|
11
|
+
return path.join(getOpenclawDir(), 'agents', 'main', 'agent', 'auth-profiles.json');
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Generate auth-profiles.json from openclaw.json auth config + envVars.
|
|
15
|
+
* openclaw.json contains profile declarations (provider, mode) without secrets.
|
|
16
|
+
* envVars contains the actual API keys.
|
|
17
|
+
*/
|
|
18
|
+
async function writeAuthProfiles(openclawConfig, envVars) {
|
|
19
|
+
const auth = openclawConfig.auth;
|
|
20
|
+
const models = openclawConfig.models;
|
|
21
|
+
const profilesPath = getAuthProfilesPath();
|
|
22
|
+
await fs.mkdir(path.dirname(profilesPath), { recursive: true });
|
|
23
|
+
const profiles = {};
|
|
24
|
+
if (auth?.profiles) {
|
|
25
|
+
// own_key mode: profiles defined in auth.profiles
|
|
26
|
+
for (const [profileName, profile] of Object.entries(auth.profiles)) {
|
|
27
|
+
// Find the API key from envVars by provider name
|
|
28
|
+
const providerEnvMap = {
|
|
29
|
+
anthropic: 'ANTHROPIC_API_KEY',
|
|
30
|
+
openai: 'OPENAI_API_KEY',
|
|
31
|
+
openrouter: 'OPENROUTER_API_KEY',
|
|
32
|
+
gemini: 'GEMINI_API_KEY',
|
|
33
|
+
};
|
|
34
|
+
const envKey = providerEnvMap[profile.provider] ?? `${profile.provider.toUpperCase()}_API_KEY`;
|
|
35
|
+
const token = envVars[envKey];
|
|
36
|
+
if (token) {
|
|
37
|
+
profiles[profileName] = {
|
|
38
|
+
type: 'token',
|
|
39
|
+
provider: profile.provider,
|
|
40
|
+
token,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
else if (models?.providers) {
|
|
46
|
+
// smart routing: proxy provider defined in models.providers
|
|
47
|
+
for (const [providerName, providerConfig] of Object.entries(models.providers)) {
|
|
48
|
+
const token = providerConfig.apiKey ?? envVars.ANTHROPIC_API_KEY ?? '';
|
|
49
|
+
if (token) {
|
|
50
|
+
profiles[`${providerName}:proxy`] = {
|
|
51
|
+
type: 'token',
|
|
52
|
+
provider: providerName,
|
|
53
|
+
token,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
if (Object.keys(profiles).length > 0) {
|
|
59
|
+
const authProfilesJson = { version: 1, profiles };
|
|
60
|
+
await fs.writeFile(profilesPath, JSON.stringify(authProfilesJson, null, 2) + '\n', { mode: 0o600 });
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
async function fileExists(p) {
|
|
64
|
+
try {
|
|
65
|
+
await fs.access(p);
|
|
66
|
+
return true;
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Apply config from bootstrap API response:
|
|
74
|
+
* 1. Write openclaw.json
|
|
75
|
+
* 2. Write auth-profiles.json + settings.json (from envVars)
|
|
76
|
+
* 3. Write .env (for VM agents)
|
|
77
|
+
* 4. Restart gateway
|
|
78
|
+
*/
|
|
79
|
+
export async function applyBootstrapConfig(data) {
|
|
80
|
+
const openclawDir = getOpenclawDir();
|
|
81
|
+
// 1. Write openclaw.json
|
|
82
|
+
if (data.openclawConfig) {
|
|
83
|
+
const configPath = path.join(openclawDir, 'openclaw.json');
|
|
84
|
+
await fs.mkdir(openclawDir, { recursive: true });
|
|
85
|
+
await fs.writeFile(configPath, JSON.stringify(data.openclawConfig, null, 2) + '\n');
|
|
86
|
+
console.log('[apply-config] openclaw.json updated');
|
|
87
|
+
}
|
|
88
|
+
// 2. Write auth-profiles.json from openclawConfig.auth.profiles + envVars (API keys)
|
|
89
|
+
if (data.openclawConfig && data.envVars) {
|
|
90
|
+
await writeAuthProfiles(data.openclawConfig, data.envVars);
|
|
91
|
+
console.log('[apply-config] auth-profiles.json updated');
|
|
92
|
+
}
|
|
93
|
+
// 3. Write settings.json (Claude Code CLI config) from envVars
|
|
94
|
+
if (data.envVars && Object.keys(data.envVars).length > 0) {
|
|
95
|
+
// Filter out empty string values (signals "remove this key")
|
|
96
|
+
const cleanEnvVars = {};
|
|
97
|
+
for (const [k, v] of Object.entries(data.envVars)) {
|
|
98
|
+
if (v !== '')
|
|
99
|
+
cleanEnvVars[k] = v;
|
|
100
|
+
}
|
|
101
|
+
await writeClaudeEnv(cleanEnvVars);
|
|
102
|
+
console.log('[apply-config] settings.json updated');
|
|
103
|
+
// 3. Write .env for VM agents
|
|
104
|
+
if (process.env.AGENT_DEPLOY_TYPE === 'vm' || await fileExists(VM_ENV_PATH)) {
|
|
105
|
+
const envContent = Object.entries(cleanEnvVars).map(([k, v]) => `${k}=${v}`).join('\n') + '\n';
|
|
106
|
+
await fs.mkdir(path.dirname(VM_ENV_PATH), { recursive: true });
|
|
107
|
+
await fs.writeFile(VM_ENV_PATH, envContent, { mode: 0o600 });
|
|
108
|
+
console.log('[apply-config] .env updated');
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
// 4. Restart gateway
|
|
112
|
+
try {
|
|
113
|
+
await restartGateway();
|
|
114
|
+
console.log('[apply-config] gateway restarted');
|
|
115
|
+
}
|
|
116
|
+
catch (err) {
|
|
117
|
+
console.error('[apply-config] gateway restart failed:', err instanceof Error ? err.message : err);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=apply-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apply-config.js","sourceRoot":"","sources":["../../src/utils/apply-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,SAAS,cAAc;IACrB,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,CAAC;AACxF,CAAC;AAED,SAAS,mBAAmB;IAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;AACtF,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,iBAAiB,CAC9B,cAAuC,EACvC,OAA+B;IAE/B,MAAM,IAAI,GAAG,cAAc,CAAC,IAAqF,CAAC;IAClH,MAAM,MAAM,GAAG,cAAc,CAAC,MAAyE,CAAC;IAExG,MAAM,YAAY,GAAG,mBAAmB,EAAE,CAAC;IAC3C,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhE,MAAM,QAAQ,GAAsE,EAAE,CAAC;IAEvF,IAAI,IAAI,EAAE,QAAQ,EAAE,CAAC;QACnB,kDAAkD;QAClD,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnE,iDAAiD;YACjD,MAAM,cAAc,GAA2B;gBAC7C,SAAS,EAAE,mBAAmB;gBAC9B,MAAM,EAAE,gBAAgB;gBACxB,UAAU,EAAE,oBAAoB;gBAChC,MAAM,EAAE,gBAAgB;aACzB,CAAC;YACF,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC;YAC/F,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAC9B,IAAI,KAAK,EAAE,CAAC;gBACV,QAAQ,CAAC,WAAW,CAAC,GAAG;oBACtB,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,KAAK;iBACN,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,MAAM,EAAE,SAAS,EAAE,CAAC;QAC7B,4DAA4D;QAC5D,KAAK,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9E,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,IAAI,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC;YACvE,IAAI,KAAK,EAAE,CAAC;gBACV,QAAQ,CAAC,GAAG,YAAY,QAAQ,CAAC,GAAG;oBAClC,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,YAAY;oBACtB,KAAK;iBACN,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;QAClD,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACtG,CAAC;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,CAAS;IACjC,IAAI,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,KAAK,CAAC;IAAC,CAAC;AAClE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAAqB;IAC9D,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,yBAAyB;IACzB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC3D,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QACpF,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC;IAED,qFAAqF;IACrF,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,iBAAiB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;IAED,+DAA+D;IAC/D,IAAI,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,6DAA6D;QAC7D,MAAM,YAAY,GAA2B,EAAE,CAAC;QAChD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,KAAK,EAAE;gBAAE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,cAAc,CAAC,YAAY,CAAC,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;QAEpD,8BAA8B;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,IAAI,IAAI,MAAM,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC5E,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YAC/F,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/D,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,qBAAqB;IACrB,IAAI,CAAC;QACH,MAAM,cAAc,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACpG,CAAC;AACH,CAAC"}
|
package/dist/utils/claude-env.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import os from 'node:os';
|
|
4
|
-
function getAuthProfilesPath() {
|
|
5
|
-
const stateDir = process.env.OPENCLAW_STATE_DIR?.trim() || path.join(os.homedir(), '.openclaw');
|
|
6
|
-
return path.join(stateDir, 'agents', 'main', 'agent', 'auth-profiles.json');
|
|
7
|
-
}
|
|
8
4
|
const CC_NOTIFY_SH = `#!/bin/bash
|
|
9
5
|
# Claude Code hook: notify OpenClaw on Stop/PermissionRequest
|
|
10
6
|
EVENT_TYPE="\${CC_HOOK_EVENT:-unknown}"
|
|
@@ -52,49 +48,41 @@ export async function writeClaudeEnv(envVars) {
|
|
|
52
48
|
const notifyPath = path.join(claudeDir, 'cc-notify.sh');
|
|
53
49
|
await fs.writeFile(notifyPath, CC_NOTIFY_SH);
|
|
54
50
|
await fs.chmod(notifyPath, 0o755);
|
|
55
|
-
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
hooks:
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
hooks: [{ type: 'command', command: 'CC_HOOK_EVENT=Notification ~/.claude/cc-notify.sh' }],
|
|
68
|
-
}],
|
|
69
|
-
},
|
|
51
|
+
const anthropicKey = envVars.ANTHROPIC_API_KEY ?? '';
|
|
52
|
+
const isOAuthToken = anthropicKey.startsWith('sk-ant-oat');
|
|
53
|
+
const hooks = {
|
|
54
|
+
PreToolUse: [{ matcher: 'Bash', hooks: [] }],
|
|
55
|
+
PostToolUse: [{ matcher: 'Write|Edit', hooks: [] }],
|
|
56
|
+
Stop: [{
|
|
57
|
+
hooks: [{ type: 'command', command: 'CC_HOOK_EVENT=Stop ~/.claude/cc-notify.sh' }],
|
|
58
|
+
}],
|
|
59
|
+
Notification: [{
|
|
60
|
+
matcher: 'permission_prompt',
|
|
61
|
+
hooks: [{ type: 'command', command: 'CC_HOOK_EVENT=Notification ~/.claude/cc-notify.sh' }],
|
|
62
|
+
}],
|
|
70
63
|
};
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
provider: 'anthropic-proxy',
|
|
83
|
-
token: envVars.ANTHROPIC_API_KEY,
|
|
84
|
-
},
|
|
85
|
-
},
|
|
86
|
-
}
|
|
87
|
-
: {
|
|
88
|
-
version: 1,
|
|
89
|
-
profiles: {
|
|
90
|
-
'anthropic:user': {
|
|
91
|
-
type: 'token',
|
|
92
|
-
provider: 'anthropic',
|
|
93
|
-
token: envVars.ANTHROPIC_API_KEY,
|
|
94
|
-
},
|
|
95
|
-
},
|
|
96
|
-
};
|
|
97
|
-
await fs.writeFile(profilesPath, JSON.stringify(profiles, null, 2) + '\n', { mode: 0o600 });
|
|
64
|
+
const permissions = {
|
|
65
|
+
allow: ['Bash(*)', 'Read(*)', 'Write(*)', 'Edit(*)', 'mcp__*'],
|
|
66
|
+
};
|
|
67
|
+
let settings;
|
|
68
|
+
if (isOAuthToken) {
|
|
69
|
+
// OAuth token flow: set ANTHROPIC_AUTH_TOKEN, no apiKeyHelper, no ANTHROPIC_BASE_URL
|
|
70
|
+
settings = {
|
|
71
|
+
permissions,
|
|
72
|
+
env: { ANTHROPIC_AUTH_TOKEN: anthropicKey },
|
|
73
|
+
hooks,
|
|
74
|
+
};
|
|
98
75
|
}
|
|
76
|
+
else {
|
|
77
|
+
// API key flow (default): apiKeyHelper + optional ANTHROPIC_BASE_URL
|
|
78
|
+
settings = {
|
|
79
|
+
permissions,
|
|
80
|
+
apiKeyHelper: "bash -c 'source /opt/openclaw-cloud/agent-controller/.env && echo $ANTHROPIC_API_KEY'",
|
|
81
|
+
...(envVars.ANTHROPIC_BASE_URL ? { env: { ANTHROPIC_BASE_URL: envVars.ANTHROPIC_BASE_URL } } : {}),
|
|
82
|
+
hooks,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
await fs.writeFile(path.join(claudeDir, 'settings.json'), JSON.stringify(settings, null, 2) + '\n');
|
|
86
|
+
// auth-profiles.json is now written by applyBootstrapConfig from openclaw.json
|
|
99
87
|
}
|
|
100
88
|
//# sourceMappingURL=claude-env.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-env.js","sourceRoot":"","sources":["../../src/utils/claude-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,
|
|
1
|
+
{"version":3,"file":"claude-env.js","sourceRoot":"","sources":["../../src/utils/claude-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCpB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAA+B;IAClE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/C,qBAAqB;IACrB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACxD,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAElC,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC;IACrD,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAE3D,MAAM,KAAK,GAAG;QACZ,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAC5C,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACnD,IAAI,EAAE,CAAC;gBACL,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC;aACnF,CAAC;QACF,YAAY,EAAE,CAAC;gBACb,OAAO,EAAE,mBAAmB;gBAC5B,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,mDAAmD,EAAE,CAAC;aAC3F,CAAC;KACH,CAAC;IAEF,MAAM,WAAW,GAAG;QAClB,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC;KAC/D,CAAC;IAEF,IAAI,QAAiC,CAAC;IACtC,IAAI,YAAY,EAAE,CAAC;QACjB,qFAAqF;QACrF,QAAQ,GAAG;YACT,WAAW;YACX,GAAG,EAAE,EAAE,oBAAoB,EAAE,YAAY,EAAE;YAC3C,KAAK;SACN,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,qEAAqE;QACrE,QAAQ,GAAG;YACT,WAAW;YACX,YAAY,EAAE,uFAAuF;YACrG,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClG,KAAK;SACN,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAEpG,+EAA+E;AACjF,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { AgentApi } from '../api.js';
|
|
2
|
+
export interface LogEntry {
|
|
3
|
+
eventType: string;
|
|
4
|
+
level: 'debug' | 'info' | 'warn' | 'error';
|
|
5
|
+
message: string;
|
|
6
|
+
metadata?: Record<string, unknown>;
|
|
7
|
+
timestamp: string;
|
|
8
|
+
}
|
|
9
|
+
export declare class LogCollector {
|
|
10
|
+
private buffer;
|
|
11
|
+
private timer;
|
|
12
|
+
private readonly flushIntervalMs;
|
|
13
|
+
private readonly maxBatchSize;
|
|
14
|
+
private readonly api;
|
|
15
|
+
constructor(api: AgentApi, opts?: {
|
|
16
|
+
flushIntervalMs?: number;
|
|
17
|
+
maxBatchSize?: number;
|
|
18
|
+
});
|
|
19
|
+
push(eventType: string, level: 'debug' | 'info' | 'warn' | 'error', message: string, metadata?: Record<string, unknown>): void;
|
|
20
|
+
flush(): Promise<void>;
|
|
21
|
+
shutdown(): Promise<void>;
|
|
22
|
+
private startTimer;
|
|
23
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
export class LogCollector {
|
|
2
|
+
buffer = [];
|
|
3
|
+
timer = null;
|
|
4
|
+
flushIntervalMs;
|
|
5
|
+
maxBatchSize;
|
|
6
|
+
api;
|
|
7
|
+
constructor(api, opts) {
|
|
8
|
+
this.api = api;
|
|
9
|
+
this.flushIntervalMs = opts?.flushIntervalMs ?? 5000;
|
|
10
|
+
this.maxBatchSize = opts?.maxBatchSize ?? 50;
|
|
11
|
+
this.startTimer();
|
|
12
|
+
}
|
|
13
|
+
push(eventType, level, message, metadata) {
|
|
14
|
+
this.buffer.push({
|
|
15
|
+
eventType,
|
|
16
|
+
level,
|
|
17
|
+
message,
|
|
18
|
+
metadata,
|
|
19
|
+
timestamp: new Date().toISOString(),
|
|
20
|
+
});
|
|
21
|
+
if (this.buffer.length >= this.maxBatchSize) {
|
|
22
|
+
this.flush().catch(() => { });
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
async flush() {
|
|
26
|
+
if (!this.buffer.length)
|
|
27
|
+
return;
|
|
28
|
+
const batch = this.buffer.splice(0);
|
|
29
|
+
try {
|
|
30
|
+
const res = await this.api.post('/api/internal/agent-logs', { entries: batch });
|
|
31
|
+
if (!res.ok) {
|
|
32
|
+
throw new Error(`HTTP ${res.status}`);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
catch (err) {
|
|
36
|
+
// On failure, put entries back at front of buffer
|
|
37
|
+
this.buffer.unshift(...batch);
|
|
38
|
+
// Cap buffer at 500 to prevent unbounded growth
|
|
39
|
+
if (this.buffer.length > 500) {
|
|
40
|
+
this.buffer.splice(500);
|
|
41
|
+
}
|
|
42
|
+
console.error('[log-collector] flush failed:', err instanceof Error ? err.message : err);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
async shutdown() {
|
|
46
|
+
if (this.timer)
|
|
47
|
+
clearInterval(this.timer);
|
|
48
|
+
this.timer = null;
|
|
49
|
+
await this.flush();
|
|
50
|
+
}
|
|
51
|
+
startTimer() {
|
|
52
|
+
this.timer = setInterval(() => this.flush().catch(() => { }), this.flushIntervalMs);
|
|
53
|
+
this.timer.unref();
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=log-collector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-collector.js","sourceRoot":"","sources":["../../src/utils/log-collector.ts"],"names":[],"mappings":"AAUA,MAAM,OAAO,YAAY;IACf,MAAM,GAAe,EAAE,CAAC;IACxB,KAAK,GAA0B,IAAI,CAAC;IAC3B,eAAe,CAAS;IACxB,YAAY,CAAS;IACrB,GAAG,CAAW;IAE/B,YAAY,GAAa,EAAE,IAA0D;QACnF,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,eAAe,GAAG,IAAI,EAAE,eAAe,IAAI,IAAI,CAAC;QACrD,IAAI,CAAC,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,CACF,SAAiB,EACjB,KAA0C,EAC1C,OAAe,EACf,QAAkC;QAElC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACf,SAAS;YACT,KAAK;YACL,OAAO;YACP,QAAQ;YACR,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5C,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAO;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YAChF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,kDAAkD;YAClD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;YAC9B,gDAAgD;YAChD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,IAAI,CAAC,KAAK;YAAE,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAEO,UAAU;QAChB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACnF,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Resolve the npm dist-tag / release channel for package installs.
|
|
3
3
|
*
|
|
4
|
-
* Env:
|
|
4
|
+
* Env: AC_RELEASE_CHANNEL=beta|stable (default: stable)
|
|
5
5
|
*
|
|
6
6
|
* - "beta" → npm install pkg@beta
|
|
7
7
|
* - "stable" → npm install pkg@latest
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-channel.js","sourceRoot":"","sources":["../../src/utils/release-channel.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,iBAAiB;IAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"release-channel.js","sourceRoot":"","sources":["../../src/utils/release-channel.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,iBAAiB;IAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACjE,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IAClC,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
package/package.json
CHANGED
package/dist/handlers/config.js
DELETED
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
import fs from 'node:fs/promises';
|
|
2
|
-
import path from 'node:path';
|
|
3
|
-
import { execGatewayRestart } from '../utils/gateway-restart.js';
|
|
4
|
-
import { toErrorMessage } from '../utils/response.js';
|
|
5
|
-
const CONFIG_DIR = '/etc/openclaw';
|
|
6
|
-
const ALLOWED_CONFIG_FILES = ['openclaw.json', 'openclaw.yaml', 'openclaw.yml'];
|
|
7
|
-
export async function handleConfig(command) {
|
|
8
|
-
const filename = command.payload.filename;
|
|
9
|
-
const content = command.payload.content;
|
|
10
|
-
if (!filename || content === undefined) {
|
|
11
|
-
return {
|
|
12
|
-
id: command.id,
|
|
13
|
-
type: 'config',
|
|
14
|
-
success: false,
|
|
15
|
-
error: 'Missing "filename" or "content" in payload',
|
|
16
|
-
};
|
|
17
|
-
}
|
|
18
|
-
const basename = path.basename(filename);
|
|
19
|
-
if (!ALLOWED_CONFIG_FILES.includes(basename)) {
|
|
20
|
-
return {
|
|
21
|
-
id: command.id,
|
|
22
|
-
type: 'config',
|
|
23
|
-
success: false,
|
|
24
|
-
error: 'Config filename not allowed',
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
const configPath = path.join(CONFIG_DIR, basename);
|
|
28
|
-
try {
|
|
29
|
-
await fs.mkdir(CONFIG_DIR, { recursive: true });
|
|
30
|
-
await fs.writeFile(configPath, content, 'utf-8');
|
|
31
|
-
const { stdout, stderr } = await execGatewayRestart();
|
|
32
|
-
return {
|
|
33
|
-
id: command.id,
|
|
34
|
-
type: 'config',
|
|
35
|
-
success: true,
|
|
36
|
-
data: { path: configPath, stdout, stderr },
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
catch (err) {
|
|
40
|
-
const e = err;
|
|
41
|
-
return {
|
|
42
|
-
id: command.id,
|
|
43
|
-
type: 'config',
|
|
44
|
-
success: false,
|
|
45
|
-
data: { path: configPath, stdout: e.stdout ?? '', stderr: e.stderr ?? '' },
|
|
46
|
-
error: toErrorMessage(e),
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
//# sourceMappingURL=config.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/handlers/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,UAAU,GAAG,eAAe,CAAC;AAEnC,MAAM,oBAAoB,GAAG,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;AAEhF,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAqB;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAkB,CAAC;IACpD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAiB,CAAC;IAElD,IAAI,CAAC,QAAQ,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,4CAA4C;SACpD,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEzC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7C,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,6BAA6B;SACrC,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAEnD,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,kBAAkB,EAAE,CAAC;QACtD,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE;SAC3C,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAAmD,CAAC;QAC9D,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE;YAC1E,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;SACzB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,67 +0,0 @@
|
|
|
1
|
-
import { writeFileSync, readFileSync, mkdirSync, existsSync } from 'node:fs';
|
|
2
|
-
import { join } from 'node:path';
|
|
3
|
-
import { homedir } from 'node:os';
|
|
4
|
-
import { toErrorMessage } from '../utils/response.js';
|
|
5
|
-
import { getProvider } from '../providers/index.js';
|
|
6
|
-
function getAuthProfilesPath() {
|
|
7
|
-
const stateDir = process.env.OPENCLAW_STATE_DIR?.trim() || join(homedir(), '.openclaw');
|
|
8
|
-
return join(stateDir, 'agents', 'main', 'agent', 'auth-profiles.json');
|
|
9
|
-
}
|
|
10
|
-
export async function handleUpdateAuthProfiles(cmd) {
|
|
11
|
-
const payload = cmd.payload;
|
|
12
|
-
if (!payload?.authProfilesJson) {
|
|
13
|
-
return { id: cmd.id, type: cmd.type, success: false, error: 'Missing authProfilesJson in payload' };
|
|
14
|
-
}
|
|
15
|
-
try {
|
|
16
|
-
const filePath = getAuthProfilesPath();
|
|
17
|
-
const dir = join(filePath, '..');
|
|
18
|
-
if (!existsSync(dir)) {
|
|
19
|
-
mkdirSync(dir, { recursive: true });
|
|
20
|
-
}
|
|
21
|
-
writeFileSync(filePath, JSON.stringify(payload.authProfilesJson, null, 2), { mode: 0o600 });
|
|
22
|
-
console.log(`[auth] Updated auth-profiles.json at ${filePath}`);
|
|
23
|
-
// Restart OpenClaw gateway to pick up new auth profiles
|
|
24
|
-
const isContainer = existsSync('/.dockerenv')
|
|
25
|
-
|| (() => { try {
|
|
26
|
-
return readFileSync('/proc/1/cmdline', 'utf8').includes('openclaw');
|
|
27
|
-
}
|
|
28
|
-
catch {
|
|
29
|
-
return false;
|
|
30
|
-
} })();
|
|
31
|
-
if (isContainer) {
|
|
32
|
-
// In containers (k8s): gateway is PID 1, `openclaw gateway restart` is a no-op.
|
|
33
|
-
// Kill PID 1 with delay — k8s will restart the container and pick up the new file.
|
|
34
|
-
console.log('[auth] Container detected, scheduling SIGTERM to PID 1 in 1s');
|
|
35
|
-
setTimeout(() => {
|
|
36
|
-
try {
|
|
37
|
-
process.kill(1, 'SIGTERM');
|
|
38
|
-
}
|
|
39
|
-
catch { /* ignore */ }
|
|
40
|
-
}, 1000);
|
|
41
|
-
return { id: cmd.id, type: cmd.type, success: true, data: { restart: 'container' } };
|
|
42
|
-
}
|
|
43
|
-
// VM/standalone: restart gateway via provider
|
|
44
|
-
try {
|
|
45
|
-
const provider = getProvider();
|
|
46
|
-
if (provider) {
|
|
47
|
-
await provider.restart();
|
|
48
|
-
console.log('[auth] OpenClaw gateway restarted');
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
51
|
-
console.warn('[auth] No provider configured, skipping gateway restart');
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
catch (err) {
|
|
55
|
-
console.error('[auth] Gateway restart failed:', toErrorMessage(err));
|
|
56
|
-
return {
|
|
57
|
-
id: cmd.id, type: cmd.type, success: true,
|
|
58
|
-
data: { warning: 'Auth profiles updated but gateway restart failed: ' + toErrorMessage(err) },
|
|
59
|
-
};
|
|
60
|
-
}
|
|
61
|
-
return { id: cmd.id, type: cmd.type, success: true, data: {} };
|
|
62
|
-
}
|
|
63
|
-
catch (err) {
|
|
64
|
-
return { id: cmd.id, type: cmd.type, success: false, error: toErrorMessage(err) };
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
//# sourceMappingURL=update-auth-profiles.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-auth-profiles.js","sourceRoot":"","sources":["../../src/handlers/update-auth-profiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
import fs from 'node:fs/promises';
|
|
2
|
-
import path from 'node:path';
|
|
3
|
-
import { toErrorMessage } from '../utils/response.js';
|
|
4
|
-
import { writeClaudeEnv } from '../utils/claude-env.js';
|
|
5
|
-
import { restartGateway } from '../utils/gateway-restart.js';
|
|
6
|
-
import { VM_ENV_PATH } from '../config-file.js';
|
|
7
|
-
export async function handleUpdateEnv(cmd) {
|
|
8
|
-
const payload = cmd.payload;
|
|
9
|
-
const envVars = payload?.env ?? {};
|
|
10
|
-
try {
|
|
11
|
-
// Read existing .env and merge new vars on top
|
|
12
|
-
let existing = {};
|
|
13
|
-
try {
|
|
14
|
-
const content = await fs.readFile(VM_ENV_PATH, 'utf-8');
|
|
15
|
-
for (const line of content.split('\n')) {
|
|
16
|
-
const trimmed = line.trim();
|
|
17
|
-
if (!trimmed || trimmed.startsWith('#'))
|
|
18
|
-
continue;
|
|
19
|
-
const eq = trimmed.indexOf('=');
|
|
20
|
-
if (eq === -1)
|
|
21
|
-
continue;
|
|
22
|
-
existing[trimmed.slice(0, eq).trim()] = trimmed.slice(eq + 1);
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
catch {
|
|
26
|
-
// File doesn't exist yet — start fresh
|
|
27
|
-
}
|
|
28
|
-
const merged = { ...existing, ...envVars };
|
|
29
|
-
const envContent = Object.entries(merged).map(([k, v]) => `${k}=${v}`).join('\n') + '\n';
|
|
30
|
-
await fs.mkdir(path.dirname(VM_ENV_PATH), { recursive: true });
|
|
31
|
-
await fs.writeFile(VM_ENV_PATH, envContent, { mode: 0o600 });
|
|
32
|
-
console.log('[update-env] .env updated');
|
|
33
|
-
// Write Claude CLI env files (settings.json, cc-notify.sh, auth-profiles.json)
|
|
34
|
-
await writeClaudeEnv(envVars);
|
|
35
|
-
console.log('[update-env] Claude CLI env written');
|
|
36
|
-
// Restart gateway
|
|
37
|
-
try {
|
|
38
|
-
await restartGateway();
|
|
39
|
-
console.log('[update-env] OpenClaw gateway restarted');
|
|
40
|
-
}
|
|
41
|
-
catch (err) {
|
|
42
|
-
console.error('[update-env] Gateway restart failed:', toErrorMessage(err));
|
|
43
|
-
return {
|
|
44
|
-
id: cmd.id, type: cmd.type, success: true,
|
|
45
|
-
data: { warning: 'Env updated but gateway restart failed: ' + toErrorMessage(err) },
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
return { id: cmd.id, type: cmd.type, success: true, data: {} };
|
|
49
|
-
}
|
|
50
|
-
catch (err) {
|
|
51
|
-
return { id: cmd.id, type: cmd.type, success: false, error: toErrorMessage(err) };
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
//# sourceMappingURL=update-env.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-env.js","sourceRoot":"","sources":["../../src/handlers/update-env.ts"],"names":[],"mappings":"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"}
|