@excitedjs/dreamux 0.1.4 → 0.2.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/README.md +64 -43
- package/dist/cli/dreamux.js +47 -18
- package/dist/cli/dreamux.js.map +1 -1
- package/dist/cli/server-ctl.js +2 -2
- package/dist/cli/server.js +7 -10
- package/dist/cli/server.js.map +1 -1
- package/dist/dispatcher/runtime.js +8 -8
- package/dist/dispatcher/runtime.js.map +1 -1
- package/dist/onboard/config-files.js +28 -85
- package/dist/onboard/config-files.js.map +1 -1
- package/dist/onboard/plugins.js +1 -1
- package/dist/onboard/plugins.js.map +1 -1
- package/dist/onboard/run.js +37 -43
- package/dist/onboard/run.js.map +1 -1
- package/dist/onboard/service.js +6 -1
- package/dist/onboard/service.js.map +1 -1
- package/dist/onboard/uninstall.js +127 -0
- package/dist/onboard/uninstall.js.map +1 -0
- package/dist/onboard/wizard.js +9 -42
- package/dist/onboard/wizard.js.map +1 -1
- package/dist/runtime/codex-args.js +1 -1
- package/dist/runtime/config.js +99 -193
- package/dist/runtime/config.js.map +1 -1
- package/dist/runtime/dispatcher-codex-home.js +8 -135
- package/dist/runtime/dispatcher-codex-home.js.map +1 -1
- package/dist/runtime/paths.js +16 -11
- package/dist/runtime/paths.js.map +1 -1
- package/dist/runtime/secrets.js +16 -14
- package/dist/runtime/secrets.js.map +1 -1
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,25 +1,29 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
export function
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
import { BUILT_IN_DEFAULTS, stringifyConfig, } from '../runtime/config.js';
|
|
2
|
+
export function buildDreamuxConfigJson(answers) {
|
|
3
|
+
return stringifyConfig(dreamuxConfigFromAnswers(answers));
|
|
4
|
+
}
|
|
5
|
+
export function dreamuxConfigFromAnswers(answers, existing) {
|
|
6
|
+
const base = existing ?? dreamuxConfigDefaultsFromAnswers(answers);
|
|
7
|
+
return {
|
|
8
|
+
runtime_dir: base.runtime_dir,
|
|
9
|
+
admin_socket: base.admin_socket,
|
|
9
10
|
codex: {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
11
|
+
...base.codex,
|
|
12
|
+
extra_args: [...base.codex.extra_args],
|
|
13
|
+
},
|
|
14
|
+
outbound: { ...base.outbound },
|
|
15
|
+
feishu: {
|
|
16
|
+
bots: {
|
|
17
|
+
...base.feishu.bots,
|
|
18
|
+
[answers.dispatcherId]: {
|
|
19
|
+
app_id: answers.botAppId,
|
|
20
|
+
app_secret: answers.botAppSecret,
|
|
21
|
+
},
|
|
22
|
+
},
|
|
19
23
|
},
|
|
20
|
-
}
|
|
24
|
+
};
|
|
21
25
|
}
|
|
22
|
-
|
|
26
|
+
function dreamuxConfigDefaultsFromAnswers(answers) {
|
|
23
27
|
return {
|
|
24
28
|
runtime_dir: answers.runtimeDir,
|
|
25
29
|
admin_socket: null,
|
|
@@ -34,48 +38,13 @@ export function dreamuxConfigFromAnswers(answers) {
|
|
|
34
38
|
retries: BUILT_IN_DEFAULTS.outbound.retries,
|
|
35
39
|
retry_delay_ms: BUILT_IN_DEFAULTS.outbound.retry_delay_ms,
|
|
36
40
|
},
|
|
41
|
+
feishu: {
|
|
42
|
+
bots: {},
|
|
43
|
+
},
|
|
37
44
|
};
|
|
38
45
|
}
|
|
39
|
-
export function
|
|
40
|
-
|
|
41
|
-
const pluginKey = pluginConfigKey(options.pluginRef, options.marketplaceName);
|
|
42
|
-
const marketplaces = objectValue(existing['marketplaces']);
|
|
43
|
-
const marketplace = objectValue(marketplaces[options.marketplaceName]);
|
|
44
|
-
const plugins = objectValue(existing['plugins']);
|
|
45
|
-
const plugin = objectValue(plugins[pluginKey]);
|
|
46
|
-
return stringifyToml({
|
|
47
|
-
...existing,
|
|
48
|
-
model: options.model,
|
|
49
|
-
approval_policy: 'never',
|
|
50
|
-
sandbox_mode: 'workspace-write',
|
|
51
|
-
default_permissions: DISPATCHER_PERMISSION_PROFILE,
|
|
52
|
-
sandbox_workspace_write: {
|
|
53
|
-
...objectValue(existing['sandbox_workspace_write']),
|
|
54
|
-
network_access: true,
|
|
55
|
-
},
|
|
56
|
-
permissions: {
|
|
57
|
-
...objectValue(existing['permissions']),
|
|
58
|
-
[DISPATCHER_PERMISSION_PROFILE]: {
|
|
59
|
-
...objectValue(objectValue(existing['permissions'])[DISPATCHER_PERMISSION_PROFILE]),
|
|
60
|
-
network: { enabled: true },
|
|
61
|
-
},
|
|
62
|
-
},
|
|
63
|
-
marketplaces: {
|
|
64
|
-
...marketplaces,
|
|
65
|
-
[options.marketplaceName]: {
|
|
66
|
-
...marketplace,
|
|
67
|
-
source: options.marketplaceSource,
|
|
68
|
-
source_type: marketplace['source_type'] ?? inferMarketplaceSourceType(options.marketplaceSource),
|
|
69
|
-
},
|
|
70
|
-
},
|
|
71
|
-
plugins: {
|
|
72
|
-
...plugins,
|
|
73
|
-
[pluginKey]: {
|
|
74
|
-
...plugin,
|
|
75
|
-
enabled: true,
|
|
76
|
-
},
|
|
77
|
-
},
|
|
78
|
-
});
|
|
46
|
+
export function dispatcherBotSecretRef(dispatcherId) {
|
|
47
|
+
return `config:${dispatcherId}`;
|
|
79
48
|
}
|
|
80
49
|
export function dispatcherCodexArgsJson() {
|
|
81
50
|
return JSON.stringify({
|
|
@@ -84,30 +53,4 @@ export function dispatcherCodexArgsJson() {
|
|
|
84
53
|
extraArgs: [],
|
|
85
54
|
});
|
|
86
55
|
}
|
|
87
|
-
function readExistingTomlObject(path) {
|
|
88
|
-
if (!existsSync(path))
|
|
89
|
-
return {};
|
|
90
|
-
const parsed = parseToml(readFileSync(path, 'utf8'));
|
|
91
|
-
return objectValue(parsed);
|
|
92
|
-
}
|
|
93
|
-
function objectValue(value) {
|
|
94
|
-
if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
|
|
95
|
-
return value;
|
|
96
|
-
}
|
|
97
|
-
return {};
|
|
98
|
-
}
|
|
99
|
-
function pluginConfigKey(pluginRef, marketplaceName) {
|
|
100
|
-
if (pluginRef.includes('@'))
|
|
101
|
-
return pluginRef;
|
|
102
|
-
return `${pluginRef}@${marketplaceName}`;
|
|
103
|
-
}
|
|
104
|
-
function inferMarketplaceSourceType(source) {
|
|
105
|
-
if (source.startsWith('http://') || source.startsWith('https://')) {
|
|
106
|
-
return 'git';
|
|
107
|
-
}
|
|
108
|
-
if (source.includes('/') && !source.startsWith('.') && !source.startsWith('/')) {
|
|
109
|
-
return 'github';
|
|
110
|
-
}
|
|
111
|
-
return 'local';
|
|
112
|
-
}
|
|
113
56
|
//# sourceMappingURL=config-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-files.js","sourceRoot":"","sources":["../../src/onboard/config-files.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config-files.js","sourceRoot":"","sources":["../../src/onboard/config-files.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,eAAe,GAChB,MAAM,sBAAsB,CAAC;AAG9B,MAAM,UAAU,sBAAsB,CAAC,OAAuB;IAC5D,OAAO,eAAe,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,OAAuB,EACvB,QAAwB;IAExB,MAAM,IAAI,GAAG,QAAQ,IAAI,gCAAgC,CAAC,OAAO,CAAC,CAAC;IACnE,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,KAAK,EAAE;YACL,GAAG,IAAI,CAAC,KAAK;YACb,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;SACvC;QACD,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE;QAC9B,MAAM,EAAE;YACN,IAAI,EAAE;gBACJ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI;gBACnB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;oBACtB,MAAM,EAAE,OAAO,CAAC,QAAQ;oBACxB,UAAU,EAAE,OAAO,CAAC,YAAY;iBACjC;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gCAAgC,CACvC,OAAuB;IAEvB,OAAO;QACL,WAAW,EAAE,OAAO,CAAC,UAAU;QAC/B,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE;YACL,GAAG,EAAE,OAAO,CAAC,QAAQ;YACrB,eAAe,EAAE,OAAO;YACxB,YAAY,EAAE,iBAAiB;YAC/B,UAAU,EAAE,EAAE;YACd,qBAAqB,EAAE,iBAAiB,CAAC,KAAK,CAAC,qBAAqB;SACrE;QACD,QAAQ,EAAE;YACR,OAAO,EAAE,iBAAiB,CAAC,QAAQ,CAAC,OAAO;YAC3C,cAAc,EAAE,iBAAiB,CAAC,QAAQ,CAAC,cAAc;SAC1D;QACD,MAAM,EAAE;YACN,IAAI,EAAE,EAAE;SACT;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,YAAoB;IACzD,OAAO,UAAU,YAAY,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,uBAAuB;IACrC,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,cAAc,EAAE,OAAO;QACvB,WAAW,EAAE,iBAAiB;QAC9B,SAAS,EAAE,EAAE;KACd,CAAC,CAAC;AACL,CAAC"}
|
package/dist/onboard/plugins.js
CHANGED
|
@@ -3,7 +3,7 @@ import { basename, join } from 'node:path';
|
|
|
3
3
|
import { parse as parseToml } from 'smol-toml';
|
|
4
4
|
import { ensureDirectory, recordFileTreeChanges, snapshotFiles, } from './ledger.js';
|
|
5
5
|
export async function installCodexmuxPlugin(options) {
|
|
6
|
-
ensureDirectory(options.codexHome, options.ledger, '
|
|
6
|
+
ensureDirectory(options.codexHome, options.ledger, 'operator Codex home', {
|
|
7
7
|
dryRun: options.answers.dryRun,
|
|
8
8
|
});
|
|
9
9
|
const before = snapshotFiles(options.codexHome);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/onboard/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,QAAQ,GACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,aAAa,GACd,MAAM,aAAa,CAAC;AAUrB,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAA6B;IAE7B,eAAe,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/onboard/plugins.ts"],"names":[],"mappings":"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"}
|
package/dist/onboard/run.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import { mkdirSync } from 'node:fs';
|
|
2
|
-
import { dirname
|
|
1
|
+
import { existsSync, mkdirSync } from 'node:fs';
|
|
2
|
+
import { dirname } from 'node:path';
|
|
3
3
|
import { DispatcherRepo } from '../db/repository.js';
|
|
4
4
|
import { openDatabase } from '../db/schema.js';
|
|
5
5
|
import { codexArgsToCli, parseCodexArgs } from '../runtime/codex-args.js';
|
|
6
|
-
import {
|
|
6
|
+
import { assertNoLegacyTomlOnly, globalConfigFile, loadConfig, stringifyConfig, } from '../runtime/config.js';
|
|
7
|
+
import { dispatcherAppServerControlDir, dispatcherCodexHome, dispatcherCodexPluginsDir, databasePath, setRuntimeConfig, } from '../runtime/paths.js';
|
|
7
8
|
import { dispatcherCodexHomeDoctorContext, validateDispatcherCodexHome, } from '../runtime/dispatcher-codex-home.js';
|
|
8
9
|
import { ExecaCommandRunner } from './commands.js';
|
|
9
|
-
import {
|
|
10
|
+
import { dispatcherBotSecretRef, dispatcherCodexArgsJson, dreamuxConfigFromAnswers, } from './config-files.js';
|
|
10
11
|
import { ensureDirectory, recordFileTreeChanges, snapshotFiles, TransparentFileLedger, writeTextFile, } from './ledger.js';
|
|
11
12
|
import { installUserService, managedServiceEnvironment } from './service.js';
|
|
12
13
|
import { installClaudemuxPlugin, installCodexmuxPlugin, } from './plugins.js';
|
|
@@ -15,54 +16,49 @@ export async function runOnboard(options) {
|
|
|
15
16
|
const ledger = options.ledger ?? new TransparentFileLedger();
|
|
16
17
|
const runner = options.runner ?? new ExecaCommandRunner();
|
|
17
18
|
const env = options.env ?? process.env;
|
|
18
|
-
const
|
|
19
|
+
const configPath = globalConfigFile({ configDir: answers.configDir });
|
|
20
|
+
const existingConfig = readExistingDreamuxConfig(answers.configDir);
|
|
21
|
+
const dreamuxConfig = dreamuxConfigFromAnswers(answers, existingConfig);
|
|
22
|
+
const effectiveAnswers = {
|
|
23
|
+
...answers,
|
|
24
|
+
runtimeDir: dreamuxConfig.runtime_dir,
|
|
25
|
+
codexBin: dreamuxConfig.codex.bin,
|
|
26
|
+
};
|
|
19
27
|
setRuntimeConfig(dreamuxConfig);
|
|
20
|
-
if (!answers.registerService) {
|
|
21
|
-
preflightAuth(answers, env);
|
|
22
|
-
}
|
|
23
|
-
const configPath = join(answers.configDir, 'config.toml');
|
|
24
28
|
ensureDirectory(answers.configDir, ledger, 'dreamux config directory', {
|
|
25
29
|
dryRun: answers.dryRun,
|
|
26
30
|
});
|
|
27
|
-
ensureDirectory(
|
|
31
|
+
ensureDirectory(effectiveAnswers.runtimeDir, ledger, 'dreamux runtime directory', {
|
|
28
32
|
dryRun: answers.dryRun,
|
|
29
33
|
});
|
|
30
|
-
writeTextFile(configPath,
|
|
34
|
+
writeTextFile(configPath, stringifyConfig(dreamuxConfig), ledger, 'dreamux global config', { mode: 0o600, dryRun: answers.dryRun });
|
|
31
35
|
const codexHome = dispatcherCodexHome(answers.dispatcherId);
|
|
32
|
-
|
|
33
|
-
ensureDirectory(codexHome, ledger, 'dispatcher private CODEX_HOME', {
|
|
36
|
+
ensureDirectory(codexHome, ledger, 'operator Codex home', {
|
|
34
37
|
dryRun: answers.dryRun,
|
|
35
38
|
});
|
|
36
39
|
ensureDirectory(dispatcherCodexPluginsDir(answers.dispatcherId), ledger, 'dispatcher Codex plugins directory', { dryRun: answers.dryRun });
|
|
37
40
|
ensureDirectory(dispatcherAppServerControlDir(answers.dispatcherId), ledger, 'dispatcher app-server control directory', { dryRun: answers.dryRun });
|
|
38
|
-
ensureDirectory(
|
|
41
|
+
ensureDirectory(effectiveAnswers.dispatcherCwd, ledger, 'dispatcher cwd', { dryRun: answers.dryRun });
|
|
39
42
|
await installCodexmuxPlugin({
|
|
40
|
-
answers,
|
|
43
|
+
answers: effectiveAnswers,
|
|
41
44
|
codexHome,
|
|
42
45
|
ledger,
|
|
43
46
|
runner,
|
|
44
47
|
});
|
|
45
|
-
writeTextFile(codexConfigPath, buildDispatcherCodexConfigToml({
|
|
46
|
-
codexHomeConfigPath: codexConfigPath,
|
|
47
|
-
model: answers.codexModel,
|
|
48
|
-
marketplaceName: answers.codexMarketplaceName,
|
|
49
|
-
marketplaceSource: answers.codexMarketplaceSource,
|
|
50
|
-
pluginRef: answers.codexPluginRef,
|
|
51
|
-
}), ledger, 'dispatcher private Codex config', { mode: 0o600, dryRun: answers.dryRun });
|
|
52
48
|
await installClaudemuxPlugin({
|
|
53
|
-
answers,
|
|
49
|
+
answers: effectiveAnswers,
|
|
54
50
|
codexHome,
|
|
55
51
|
ledger,
|
|
56
52
|
runner,
|
|
57
53
|
});
|
|
58
|
-
registerDispatcher(
|
|
59
|
-
const doctor = runDispatcherDoctor(
|
|
60
|
-
if (!
|
|
61
|
-
throw new Error(formatDoctorFailure(
|
|
54
|
+
registerDispatcher(effectiveAnswers, ledger);
|
|
55
|
+
const doctor = runDispatcherDoctor(effectiveAnswers, dreamuxConfig, env);
|
|
56
|
+
if (!effectiveAnswers.dryRun && !doctor.ok) {
|
|
57
|
+
throw new Error(formatDoctorFailure(effectiveAnswers, doctor));
|
|
62
58
|
}
|
|
63
|
-
const service =
|
|
59
|
+
const service = effectiveAnswers.registerService
|
|
64
60
|
? await installUserService({
|
|
65
|
-
answers,
|
|
61
|
+
answers: effectiveAnswers,
|
|
66
62
|
ledger,
|
|
67
63
|
runner,
|
|
68
64
|
platform: options.platform,
|
|
@@ -76,6 +72,13 @@ export async function runOnboard(options) {
|
|
|
76
72
|
service,
|
|
77
73
|
};
|
|
78
74
|
}
|
|
75
|
+
function readExistingDreamuxConfig(configDir) {
|
|
76
|
+
const configPath = globalConfigFile({ configDir });
|
|
77
|
+
assertNoLegacyTomlOnly({ configDir });
|
|
78
|
+
if (!existsSync(configPath))
|
|
79
|
+
return undefined;
|
|
80
|
+
return loadConfig({ configDir }).config;
|
|
81
|
+
}
|
|
79
82
|
function registerDispatcher(answers, ledger) {
|
|
80
83
|
const dbPath = databasePath();
|
|
81
84
|
ensureDirectory(dirname(dbPath), ledger, 'dispatcher database directory', {
|
|
@@ -92,9 +95,9 @@ function registerDispatcher(answers, ledger) {
|
|
|
92
95
|
new DispatcherRepo(db).upsert({
|
|
93
96
|
dispatcher_id: answers.dispatcherId,
|
|
94
97
|
bot_app_id: answers.botAppId,
|
|
95
|
-
bot_secret_ref: answers.
|
|
98
|
+
bot_secret_ref: dispatcherBotSecretRef(answers.dispatcherId),
|
|
96
99
|
codex_args_json: dispatcherCodexArgsJson(),
|
|
97
|
-
codex_cwd:
|
|
100
|
+
codex_cwd: answers.dispatcherCwd,
|
|
98
101
|
});
|
|
99
102
|
}
|
|
100
103
|
finally {
|
|
@@ -129,22 +132,13 @@ function runDispatcherDoctor(answers, dreamuxConfig, env) {
|
|
|
129
132
|
}
|
|
130
133
|
function formatDoctorFailure(answers, doctor) {
|
|
131
134
|
const lines = [
|
|
132
|
-
`dispatcher '${answers.dispatcherId}'
|
|
135
|
+
`dispatcher '${answers.dispatcherId}' Codex home is not ready`,
|
|
133
136
|
...doctor.errors.map((error) => `- ${error}`),
|
|
134
137
|
];
|
|
135
138
|
if (answers.registerService &&
|
|
136
|
-
doctor.errors.some((error) => error.includes('missing
|
|
137
|
-
lines.push('- managed service environments do not inherit your interactive shell auth token', `- authenticate the
|
|
139
|
+
doctor.errors.some((error) => error.includes('missing Codex auth state'))) {
|
|
140
|
+
lines.push('- managed service environments do not inherit your interactive shell auth token', `- authenticate the Codex home before registering the service: CODEX_HOME=${doctor.context.codexHome} ${answers.codexBin} login`);
|
|
138
141
|
}
|
|
139
142
|
return lines.join('\n');
|
|
140
143
|
}
|
|
141
|
-
function preflightAuth(answers, env) {
|
|
142
|
-
if (answers.dryRun)
|
|
143
|
-
return;
|
|
144
|
-
const value = env[answers.authEnvVar];
|
|
145
|
-
if (value !== undefined && value.trim() !== '')
|
|
146
|
-
return;
|
|
147
|
-
throw new Error(`missing dispatcher Codex auth env var ${answers.authEnvVar}; ` +
|
|
148
|
-
'onboard does not write API secrets into the private CODEX_HOME');
|
|
149
|
-
}
|
|
150
144
|
//# sourceMappingURL=run.js.map
|
package/dist/onboard/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/onboard/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/onboard/run.ts"],"names":[],"mappings":"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"}
|
package/dist/onboard/service.js
CHANGED
|
@@ -89,11 +89,16 @@ WantedBy=default.target
|
|
|
89
89
|
`;
|
|
90
90
|
}
|
|
91
91
|
export function managedServiceEnvironment(answers) {
|
|
92
|
-
|
|
92
|
+
const env = {
|
|
93
93
|
DREAMUX_CONFIG_DIR: answers.configDir,
|
|
94
94
|
CODEX_HOST_RUNTIME_DIR: answers.runtimeDir,
|
|
95
95
|
CODEX_HOST_CODEX_BIN: answers.codexBin,
|
|
96
96
|
};
|
|
97
|
+
const codexHome = process.env['CODEX_HOME'];
|
|
98
|
+
if (codexHome !== undefined && codexHome !== '') {
|
|
99
|
+
env['CODEX_HOME'] = codexHome;
|
|
100
|
+
}
|
|
101
|
+
return env;
|
|
97
102
|
}
|
|
98
103
|
async function registerLaunchd(unitPath, unitStatus, options) {
|
|
99
104
|
const uid = options.uid ?? process.getuid?.();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/onboard/service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/onboard/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { existsSync, rmSync } from 'node:fs';
|
|
2
|
+
import { homedir } from 'node:os';
|
|
3
|
+
import { basename, join, resolve, sep } from 'node:path';
|
|
4
|
+
import { ExecaCommandRunner } from './commands.js';
|
|
5
|
+
import { LAUNCHD_LABEL, serviceUnitPath, SYSTEMD_UNIT, } from './service.js';
|
|
6
|
+
import { assertNoLegacyTomlOnly, BUILT_IN_DEFAULTS, expandHome, globalConfigDir, globalConfigFile, loadConfig, } from '../runtime/config.js';
|
|
7
|
+
export async function runUninstall(options = {}) {
|
|
8
|
+
const runner = options.runner ?? new ExecaCommandRunner();
|
|
9
|
+
const dryRun = options.dryRun ?? false;
|
|
10
|
+
const configDir = normalizePath(options.configDir ?? globalConfigDir());
|
|
11
|
+
const runtimeDir = normalizePath(resolveRuntimeDir(configDir, options.runtimeDir));
|
|
12
|
+
const entries = [];
|
|
13
|
+
const unit = serviceUnitPath(options.platform, options.homeDir ?? homedir());
|
|
14
|
+
assertSafeOwnedDirectory(runtimeDir, 'dreamux runtime directory');
|
|
15
|
+
assertSafeOwnedDirectory(configDir, 'dreamux config directory');
|
|
16
|
+
await unregisterService({
|
|
17
|
+
unitPath: unit.path,
|
|
18
|
+
platform: unit.platform,
|
|
19
|
+
runner,
|
|
20
|
+
dryRun,
|
|
21
|
+
uid: options.uid,
|
|
22
|
+
});
|
|
23
|
+
removePath(unit.path, entries, `${unit.platform} unit`, dryRun);
|
|
24
|
+
if (unit.platform === 'systemd') {
|
|
25
|
+
await runBestEffort(runner, 'systemctl', ['--user', 'daemon-reload'], dryRun);
|
|
26
|
+
}
|
|
27
|
+
removeOwnedDirectory(runtimeDir, entries, 'dreamux runtime directory', dryRun);
|
|
28
|
+
removeOwnedDirectory(configDir, entries, 'dreamux config directory', dryRun);
|
|
29
|
+
return {
|
|
30
|
+
entries: entries.sort((a, b) => a.path.localeCompare(b.path)),
|
|
31
|
+
service: {
|
|
32
|
+
platform: unit.platform,
|
|
33
|
+
unitPath: unit.path,
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
function resolveRuntimeDir(configDir, explicit) {
|
|
38
|
+
if (explicit !== undefined && explicit !== '')
|
|
39
|
+
return explicit;
|
|
40
|
+
assertNoLegacyTomlOnly({ configDir });
|
|
41
|
+
if (!existsSync(globalConfigFile({ configDir }))) {
|
|
42
|
+
return BUILT_IN_DEFAULTS.runtime_dir;
|
|
43
|
+
}
|
|
44
|
+
return loadConfig({ configDir }).config.runtime_dir;
|
|
45
|
+
}
|
|
46
|
+
async function unregisterService(options) {
|
|
47
|
+
if (options.platform === 'launchd') {
|
|
48
|
+
const uid = options.uid ?? process.getuid?.();
|
|
49
|
+
if (uid === undefined) {
|
|
50
|
+
throw new Error('launchd user service uninstall requires a numeric uid');
|
|
51
|
+
}
|
|
52
|
+
const serviceTarget = `gui/${uid}/${LAUNCHD_LABEL}`;
|
|
53
|
+
const loaded = await options.runner.check('launchctl', ['print', serviceTarget], { dryRun: options.dryRun });
|
|
54
|
+
if (loaded) {
|
|
55
|
+
await runBestEffort(options.runner, 'launchctl', ['bootout', serviceTarget], options.dryRun);
|
|
56
|
+
}
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
await runBestEffort(options.runner, 'systemctl', ['--user', 'disable', '--now', SYSTEMD_UNIT], options.dryRun);
|
|
60
|
+
}
|
|
61
|
+
async function runBestEffort(runner, command, args, dryRun) {
|
|
62
|
+
try {
|
|
63
|
+
await runner.run(command, args, { dryRun });
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
/* The unit may already be absent or stopped; file deletion below is authoritative. */
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
function removeOwnedDirectory(path, entries, reason, dryRun) {
|
|
70
|
+
assertSafeOwnedDirectory(path, reason);
|
|
71
|
+
removePath(path, entries, reason, dryRun);
|
|
72
|
+
}
|
|
73
|
+
function removePath(path, entries, reason, dryRun) {
|
|
74
|
+
if (!existsSync(path)) {
|
|
75
|
+
entries.push({ path, status: 'missing', reason });
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
if (!dryRun) {
|
|
79
|
+
rmSync(path, {
|
|
80
|
+
recursive: true,
|
|
81
|
+
force: true,
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
entries.push({ path, status: 'removed', reason });
|
|
85
|
+
}
|
|
86
|
+
function assertSafeOwnedDirectory(path, reason) {
|
|
87
|
+
const normalized = normalizePath(path);
|
|
88
|
+
const home = normalizePath(homedir());
|
|
89
|
+
if (normalized === '/' ||
|
|
90
|
+
normalized === home ||
|
|
91
|
+
basename(normalized) === '' ||
|
|
92
|
+
normalized === normalizePath(process.cwd())) {
|
|
93
|
+
throw new Error(`refusing to remove unsafe ${reason}: ${path}`);
|
|
94
|
+
}
|
|
95
|
+
for (const protectedRoot of operatorStateRoots()) {
|
|
96
|
+
if (isSameOrInside(normalized, protectedRoot)) {
|
|
97
|
+
throw new Error(`refusing to remove unsafe ${reason}: ${path} is inside operator Codex/Claude state ${protectedRoot}`);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
function normalizePath(path) {
|
|
102
|
+
return resolve(expandHome(path));
|
|
103
|
+
}
|
|
104
|
+
function operatorStateRoots() {
|
|
105
|
+
return uniquePaths([
|
|
106
|
+
joinHome('.codex'),
|
|
107
|
+
process.env['CODEX_HOME'],
|
|
108
|
+
joinHome('.claude'),
|
|
109
|
+
process.env['CLAUDE_CONFIG_DIR'],
|
|
110
|
+
]);
|
|
111
|
+
}
|
|
112
|
+
function joinHome(child) {
|
|
113
|
+
return normalizePath(join(homedir(), child));
|
|
114
|
+
}
|
|
115
|
+
function uniquePaths(paths) {
|
|
116
|
+
const out = new Set();
|
|
117
|
+
for (const path of paths) {
|
|
118
|
+
if (path === undefined || path.trim() === '')
|
|
119
|
+
continue;
|
|
120
|
+
out.add(normalizePath(path));
|
|
121
|
+
}
|
|
122
|
+
return Array.from(out);
|
|
123
|
+
}
|
|
124
|
+
function isSameOrInside(path, root) {
|
|
125
|
+
return path === root || path.startsWith(`${root}${sep}`);
|
|
126
|
+
}
|
|
127
|
+
//# sourceMappingURL=uninstall.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../src/onboard/uninstall.ts"],"names":[],"mappings":"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"}
|