echo-cli-agent 0.1.1 → 0.1.3
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 +30 -0
- package/dist/src/config.d.ts +0 -5
- package/dist/src/config.js +12 -9
- package/dist/src/config.js.map +1 -1
- package/dist/src/index.js +69 -5
- package/dist/src/index.js.map +1 -1
- package/dist/src/providers/provider.js +7 -3
- package/dist/src/providers/provider.js.map +1 -1
- package/dist/src/runtime/agent-runtime.d.ts +5 -0
- package/dist/src/runtime/agent-runtime.js +9 -0
- package/dist/src/runtime/agent-runtime.js.map +1 -1
- package/dist/src/session/session-manager.js +2 -2
- package/dist/tests/config-compatibility.test.d.ts +1 -0
- package/dist/tests/config-compatibility.test.js +49 -0
- package/dist/tests/config-compatibility.test.js.map +1 -0
- package/dist/tests/runtime-capabilities.test.d.ts +1 -0
- package/dist/tests/runtime-capabilities.test.js +17 -0
- package/dist/tests/runtime-capabilities.test.js.map +1 -0
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -33,6 +33,36 @@ echo-cli-agent service:install
|
|
|
33
33
|
echo-cli-agent service:uninstall
|
|
34
34
|
```
|
|
35
35
|
|
|
36
|
+
## Update
|
|
37
|
+
|
|
38
|
+
On a Mini or Linux server that does not use the desktop client, run:
|
|
39
|
+
|
|
40
|
+
```bash
|
|
41
|
+
echo-cli-agent update
|
|
42
|
+
```
|
|
43
|
+
|
|
44
|
+
The command installs the latest npm package and restarts the configured background service. For an Agent version that predates the `update` command, use this compatible one-line command once:
|
|
45
|
+
|
|
46
|
+
```bash
|
|
47
|
+
npm install -g echo-cli-agent@latest && echo-cli-agent service:install
|
|
48
|
+
```
|
|
49
|
+
|
|
50
|
+
If the Agent uses a non-default config file, run:
|
|
51
|
+
|
|
52
|
+
```bash
|
|
53
|
+
echo-cli-agent update --config /absolute/path/config.json
|
|
54
|
+
```
|
|
55
|
+
|
|
56
|
+
## Publish
|
|
57
|
+
|
|
58
|
+
From the repository root, run:
|
|
59
|
+
|
|
60
|
+
```bash
|
|
61
|
+
./publish-npm.mjs
|
|
62
|
+
```
|
|
63
|
+
|
|
64
|
+
The script securely prompts for an npm token, builds the package, automatically increments the patch version when the local version is not newer than npm, and publishes to the public npm registry. The token is only written to a temporary private file during publishing and is removed immediately afterward.
|
|
65
|
+
|
|
36
66
|
## License
|
|
37
67
|
|
|
38
68
|
MIT
|
package/dist/src/config.d.ts
CHANGED
|
@@ -24,11 +24,6 @@ export type EnrollmentOptions = {
|
|
|
24
24
|
code: string;
|
|
25
25
|
deviceName?: string;
|
|
26
26
|
configPath?: string;
|
|
27
|
-
/** User's JWT access token. When provided, the server verifies it matches
|
|
28
|
-
* the account that generated the pairing code, preventing cross-account
|
|
29
|
-
* redemption. Optional: headless Linux enrollment without a token is still
|
|
30
|
-
* accepted by the server. */
|
|
31
|
-
userToken?: string;
|
|
32
27
|
};
|
|
33
28
|
export declare function enrollDevice(options: EnrollmentOptions): Promise<{
|
|
34
29
|
deviceId: string;
|
package/dist/src/config.js
CHANGED
|
@@ -33,7 +33,7 @@ export function defaultDataDir() {
|
|
|
33
33
|
}
|
|
34
34
|
return join(process.env.XDG_STATE_HOME ?? join(homedir(), '.local', 'state'), 'echo-cli-agent');
|
|
35
35
|
}
|
|
36
|
-
export function defaultConfigPath(dataDir = resolve(process.env.ECHO_AGENT_DATA_DIR ?? defaultDataDir())) {
|
|
36
|
+
export function defaultConfigPath(dataDir = resolve(process.env.ECHO_AGENT_DATA_DIR ?? process.env.API_OCRA_DATA_DIR ?? defaultDataDir())) {
|
|
37
37
|
return resolve(process.env.ECHO_AGENT_CONFIG ?? join(dataDir, 'config.json'));
|
|
38
38
|
}
|
|
39
39
|
export async function enrollDevice(options) {
|
|
@@ -44,14 +44,13 @@ export async function enrollDevice(options) {
|
|
|
44
44
|
body: JSON.stringify({
|
|
45
45
|
code: options.code,
|
|
46
46
|
...(options.deviceName ? { device_name: options.deviceName } : {}),
|
|
47
|
-
platform: platform()
|
|
48
|
-
...(options.userToken ? { user_token: options.userToken } : {})
|
|
47
|
+
platform: platform()
|
|
49
48
|
})
|
|
50
49
|
});
|
|
51
50
|
if (!response.ok)
|
|
52
51
|
throw new Error(`device enrollment failed (${response.status})`);
|
|
53
52
|
const enrolled = EnrollResponseSchema.parse(await response.json());
|
|
54
|
-
const dataDir = resolve(process.env.ECHO_AGENT_DATA_DIR ?? defaultDataDir());
|
|
53
|
+
const dataDir = resolve(process.env.ECHO_AGENT_DATA_DIR ?? process.env.API_OCRA_DATA_DIR ?? defaultDataDir());
|
|
55
54
|
const configPath = resolve(options.configPath ?? defaultConfigPath(dataDir));
|
|
56
55
|
await mkdir(dirname(configPath), { recursive: true, mode: 0o700 });
|
|
57
56
|
const existing = existsSync(configPath)
|
|
@@ -88,7 +87,7 @@ function parseRoots(value) {
|
|
|
88
87
|
.filter(Boolean);
|
|
89
88
|
}
|
|
90
89
|
export function loadAgentConfig() {
|
|
91
|
-
const dataDir = resolve(process.env.ECHO_AGENT_DATA_DIR ?? defaultDataDir());
|
|
90
|
+
const dataDir = resolve(process.env.ECHO_AGENT_DATA_DIR ?? process.env.API_OCRA_DATA_DIR ?? defaultDataDir());
|
|
92
91
|
const configPath = defaultConfigPath(dataDir);
|
|
93
92
|
let fileConfig = {};
|
|
94
93
|
if (existsSync(configPath)) {
|
|
@@ -104,7 +103,7 @@ export function loadAgentConfig() {
|
|
|
104
103
|
if (!deviceId)
|
|
105
104
|
throw new Error('TASKMCP_DEVICE_ID is required from api_user route context');
|
|
106
105
|
const roots = parseRoots(process.env.TASKMCP_ALLOWED_ROOTS) ?? fileConfig.allowedRoots ?? [homedir()];
|
|
107
|
-
const healthPortText = process.env.ECHO_AGENT_HEALTH_PORT;
|
|
106
|
+
const healthPortText = process.env.ECHO_AGENT_HEALTH_PORT ?? process.env.API_OCRA_HEALTH_PORT;
|
|
108
107
|
const healthPort = healthPortText ? Number.parseInt(healthPortText, 10) : (fileConfig.healthPort ?? 17329);
|
|
109
108
|
if (!Number.isInteger(healthPort) || healthPort < 0 || healthPort > 65535) {
|
|
110
109
|
throw new Error('ECHO_AGENT_HEALTH_PORT must be between 0 and 65535');
|
|
@@ -118,20 +117,24 @@ export function loadAgentConfig() {
|
|
|
118
117
|
deviceId,
|
|
119
118
|
deviceName: process.env.TASKMCP_DEVICE_NAME ?? fileConfig.deviceName ?? hostname(),
|
|
120
119
|
endpoint: process.env.TASKMCP_ENDPOINT ?? fileConfig.endpoint ?? 'cli',
|
|
121
|
-
capabilities: (process.env.ECHO_AGENT_CAPABILITIES ?? '')
|
|
120
|
+
capabilities: (process.env.ECHO_AGENT_CAPABILITIES ?? process.env.API_OCRA_CAPABILITIES ?? '')
|
|
122
121
|
.split(',')
|
|
123
122
|
.map((value) => value.trim().toLowerCase())
|
|
124
123
|
.filter(Boolean),
|
|
125
124
|
platform: platform(),
|
|
126
125
|
allowedRoots: roots.map((root) => resolve(root)),
|
|
127
126
|
allowExecutableOverride: process.env.ECHO_AGENT_ALLOW_EXECUTABLE_OVERRIDE === 'true' ||
|
|
127
|
+
process.env.API_OCRA_ALLOW_EXECUTABLE_OVERRIDE === 'true' ||
|
|
128
128
|
fileConfig.allowExecutableOverride === true,
|
|
129
129
|
dataDir,
|
|
130
130
|
stateFile: join(dataDir, 'state.json'),
|
|
131
131
|
logFile: join(dataDir, 'logs', 'agent.log'),
|
|
132
|
-
healthHost: process.env.ECHO_AGENT_HEALTH_HOST ?? fileConfig.healthHost ?? '127.0.0.1',
|
|
132
|
+
healthHost: process.env.ECHO_AGENT_HEALTH_HOST ?? process.env.API_OCRA_HEALTH_HOST ?? fileConfig.healthHost ?? '127.0.0.1',
|
|
133
133
|
healthPort,
|
|
134
|
-
logLevel: process.env.ECHO_AGENT_LOG_LEVEL ??
|
|
134
|
+
logLevel: process.env.ECHO_AGENT_LOG_LEVEL ??
|
|
135
|
+
process.env.API_OCRA_LOG_LEVEL ??
|
|
136
|
+
fileConfig.logLevel ??
|
|
137
|
+
'info'
|
|
135
138
|
};
|
|
136
139
|
}
|
|
137
140
|
export function redactedConfig(config) {
|
package/dist/src/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC7D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,MAAM,gBAAgB,GAAG,CAAC;KACvB,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAClC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC9C,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACvC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACtC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACxC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC9C,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC5C,uBAAuB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC/C,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;IACzD,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE;CAChE,CAAC;KACD,MAAM,EAAE,CAAA;AAEX,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IACxB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC/B,CAAC,CAAA;AAqBF,MAAM,UAAU,cAAc;IAC5B,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,qBAAqB,EAAE,gBAAgB,CAAC,CAAA;IAC5E,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAA;IACjE,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAA;AACjG,CAAC;AAED,MAAM,UAAU,iBAAiB,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.js
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import {
|
|
2
|
+
import { spawnSync } from 'node:child_process';
|
|
3
|
+
import { existsSync } from 'node:fs';
|
|
4
|
+
import { dirname, resolve } from 'node:path';
|
|
5
|
+
import { fileURLToPath } from 'node:url';
|
|
6
|
+
import { defaultConfigPath, enrollDevice, loadAgentConfig, redactedConfig } from './config.js';
|
|
3
7
|
import { probeProviders } from './providers/registry.js';
|
|
4
8
|
import { AgentRuntime } from './runtime/agent-runtime.js';
|
|
5
9
|
import { hydrateShellPath, mergePathSegments } from './runtime/cli/hydrate-shell-path.js';
|
|
@@ -50,15 +54,48 @@ async function enroll(args) {
|
|
|
50
54
|
};
|
|
51
55
|
const deviceName = option(args, '--device-name');
|
|
52
56
|
const configPath = option(args, '--config');
|
|
53
|
-
const userToken = option(args, '--user-token');
|
|
54
57
|
const result = await enrollDevice({
|
|
55
58
|
...enrollment,
|
|
56
59
|
...(deviceName ? { deviceName } : {}),
|
|
57
|
-
...(configPath ? { configPath } : {})
|
|
58
|
-
...(userToken ? { userToken } : {})
|
|
60
|
+
...(configPath ? { configPath } : {})
|
|
59
61
|
});
|
|
60
62
|
process.stdout.write(`${JSON.stringify({ enrolled: true, deviceId: result.deviceId, configPath: result.configPath })}\n`);
|
|
61
63
|
}
|
|
64
|
+
function manageService(action, args) {
|
|
65
|
+
const script = resolve(dirname(fileURLToPath(import.meta.url)), '../../scripts/service.mjs');
|
|
66
|
+
if (!existsSync(script))
|
|
67
|
+
throw new Error(`service manager is missing: ${script}`);
|
|
68
|
+
const result = spawnSync(process.execPath, [script, action, ...args], { stdio: 'inherit', shell: false });
|
|
69
|
+
if (result.error)
|
|
70
|
+
throw result.error;
|
|
71
|
+
if (result.status !== 0) {
|
|
72
|
+
process.exitCode = result.status ?? 1;
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
return true;
|
|
76
|
+
}
|
|
77
|
+
function update(args) {
|
|
78
|
+
const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
79
|
+
const install = spawnSync(npmCommand, ['install', '-g', 'echo-cli-agent@latest'], {
|
|
80
|
+
stdio: 'inherit',
|
|
81
|
+
shell: false
|
|
82
|
+
});
|
|
83
|
+
if (install.error)
|
|
84
|
+
throw install.error;
|
|
85
|
+
if (install.status !== 0) {
|
|
86
|
+
process.exitCode = install.status ?? 1;
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const configPath = option(args, '--config');
|
|
90
|
+
const effectiveConfigPath = configPath ?? defaultConfigPath();
|
|
91
|
+
if (!existsSync(effectiveConfigPath)) {
|
|
92
|
+
process.stdout.write('echo-cli-agent was updated. No local configuration was found, so no background service was restarted.\n');
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
if (!manageService('install', configPath ? ['--config', configPath] : []))
|
|
96
|
+
return;
|
|
97
|
+
process.stdout.write('echo-cli-agent was updated and its background service was restarted.\n');
|
|
98
|
+
}
|
|
62
99
|
function option(args, name) {
|
|
63
100
|
const index = args.indexOf(name);
|
|
64
101
|
const value = index >= 0 ? args[index + 1] : undefined;
|
|
@@ -77,8 +114,35 @@ else if (command === 'enroll')
|
|
|
77
114
|
process.stderr.write(`echo-cli-agent enrollment failed: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
78
115
|
process.exitCode = 1;
|
|
79
116
|
});
|
|
117
|
+
else if (command === 'service:install') {
|
|
118
|
+
try {
|
|
119
|
+
manageService('install', process.argv.slice(3));
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
process.stderr.write(`echo-cli-agent service installation failed: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
123
|
+
process.exitCode = 1;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
else if (command === 'service:uninstall') {
|
|
127
|
+
try {
|
|
128
|
+
manageService('uninstall', process.argv.slice(3));
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
process.stderr.write(`echo-cli-agent service removal failed: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
132
|
+
process.exitCode = 1;
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
else if (command === 'update') {
|
|
136
|
+
try {
|
|
137
|
+
update(process.argv.slice(3));
|
|
138
|
+
}
|
|
139
|
+
catch (error) {
|
|
140
|
+
process.stderr.write(`echo-cli-agent update failed: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
141
|
+
process.exitCode = 1;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
80
144
|
else {
|
|
81
|
-
process.stderr.write('Usage: echo-cli-agent [run|doctor|enroll]\n');
|
|
145
|
+
process.stderr.write('Usage: echo-cli-agent [run|doctor|enroll|service:install|service:uninstall|update]\n');
|
|
82
146
|
process.exitCode = 2;
|
|
83
147
|
}
|
|
84
148
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,14 +40,18 @@ export function providerEnvironment(request) {
|
|
|
40
40
|
return env;
|
|
41
41
|
}
|
|
42
42
|
export function resolveCodexExecutable(args, environment) {
|
|
43
|
-
const configured = process.env.ECHO_AGENT_CODEX_PATH?.trim();
|
|
43
|
+
const configured = (process.env.ECHO_AGENT_CODEX_PATH ?? process.env.API_OCRA_CODEX_PATH)?.trim();
|
|
44
44
|
const candidate = configured || resolveCliCommand('codex', environment.PATH === undefined ? {} : { pathEnv: environment.PATH });
|
|
45
45
|
if (!candidate)
|
|
46
46
|
return { executable: 'codex', args };
|
|
47
47
|
try {
|
|
48
48
|
const resolved = realpathSync(candidate);
|
|
49
|
-
if (resolved.endsWith('.js'))
|
|
50
|
-
return {
|
|
49
|
+
if (resolved.endsWith('.js')) {
|
|
50
|
+
return {
|
|
51
|
+
executable: process.env.ECHO_AGENT_NODE_PATH || process.env.API_OCRA_NODE_PATH || process.execPath,
|
|
52
|
+
args: [resolved, ...args]
|
|
53
|
+
};
|
|
54
|
+
}
|
|
51
55
|
return { executable: resolved, args };
|
|
52
56
|
}
|
|
53
57
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/providers/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAGpD,OAAO,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AA4BvG;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAc;IAClD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,4BAA4B,EAAE,EAAE,CAAC,CAAA;IAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CACvB,kGAAkG,CACnG,CAAA;IACD,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAoC;IACrE,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAA;IACrB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACtD,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,gCAAgC,CAAC,IAAI,EAAE,CAAA;IACnE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAA;AAC3E,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,QAAgB,EAChB,SAA6B,EAC7B,aAAsB;IAEtB,OAAO,aAAa,IAAI,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;AACzE,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAwB;IAC1D,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAC9B,MAAM,YAAY,GAAG;QACnB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;QACzB,GAAG,yBAAyB,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;QACjF,GAAG,CAAC,IAAI;QACR,mBAAmB;QACnB,gBAAgB;QAChB,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC;KACjC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;IACpD,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACrD,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC5B,GAAG,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAA;QAChD,GAAG,CAAC,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAA;IAC/C,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAc,EAAE,WAA8B;IACnF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/providers/provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import type { AgentConfig } from '../config.js';
|
|
2
|
+
export type ProviderCapabilityProbe = {
|
|
3
|
+
id: string;
|
|
4
|
+
available: boolean;
|
|
5
|
+
};
|
|
6
|
+
export declare function selectCapabilities(configured: readonly string[], probes: readonly ProviderCapabilityProbe[]): string[];
|
|
2
7
|
export declare class AgentRuntime {
|
|
3
8
|
private readonly config;
|
|
4
9
|
private readonly logger;
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
import { Dispatcher } from '../dispatch/dispatcher.js';
|
|
2
2
|
import { HealthServer } from '../health/server.js';
|
|
3
3
|
import { createDiagnosticLogger } from '../logging/diagnostic-log.js';
|
|
4
|
+
import { probeProviders } from '../providers/registry.js';
|
|
4
5
|
import { SessionManager } from '../session/session-manager.js';
|
|
5
6
|
import { StateStore } from '../state/state-store.js';
|
|
6
7
|
import { TaskMcpClient } from '../transport/taskmcp-client.js';
|
|
7
8
|
import { hydrateShellPath, mergePathSegments } from './cli/hydrate-shell-path.js';
|
|
9
|
+
export function selectCapabilities(configured, probes) {
|
|
10
|
+
const explicit = [...new Set(configured.map((value) => value.trim().toLowerCase()).filter(Boolean))];
|
|
11
|
+
if (explicit.length > 0)
|
|
12
|
+
return explicit;
|
|
13
|
+
return [...new Set(probes.filter((probe) => probe.available).map((probe) => probe.id.trim().toLowerCase()).filter(Boolean))];
|
|
14
|
+
}
|
|
8
15
|
export class AgentRuntime {
|
|
9
16
|
config;
|
|
10
17
|
logger;
|
|
@@ -22,6 +29,7 @@ export class AgentRuntime {
|
|
|
22
29
|
const hydration = await hydrateShellPath();
|
|
23
30
|
if (hydration.ok)
|
|
24
31
|
mergePathSegments(hydration.segments);
|
|
32
|
+
this.config.capabilities = selectCapabilities(this.config.capabilities, probeProviders());
|
|
25
33
|
await this.state.initialize();
|
|
26
34
|
const deviceId = this.config.deviceId;
|
|
27
35
|
this.sessions = new SessionManager(this.config, this.state, this.logger);
|
|
@@ -31,6 +39,7 @@ export class AgentRuntime {
|
|
|
31
39
|
this.health = new HealthServer(this.config.healthHost, this.config.healthPort, () => ({
|
|
32
40
|
deviceId,
|
|
33
41
|
connected: this.client?.connected ?? false,
|
|
42
|
+
capabilities: this.config.capabilities,
|
|
34
43
|
activeSessions: this.sessions?.activeCount ?? 0,
|
|
35
44
|
storedRuns: this.state.snapshot().runs,
|
|
36
45
|
startedAt: this.startedAt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-runtime.js","sourceRoot":"","sources":["../../../src/runtime/agent-runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"agent-runtime.js","sourceRoot":"","sources":["../../../src/runtime/agent-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export class SessionManager {
|
|
|
25
25
|
async createWindow(request) {
|
|
26
26
|
const provider = resolveProvider(request.agent_type);
|
|
27
27
|
if (this.config.capabilities.length > 0 && !this.config.capabilities.includes(provider.id)) {
|
|
28
|
-
throw new Error(`CLI
|
|
28
|
+
throw new Error(`CLI 不可用：本机 Agent 未检测到 ${provider.id} CLI`);
|
|
29
29
|
}
|
|
30
30
|
const workdir = await this.validateWorkdir(request.workdir ?? this.config.allowedRoots[0]);
|
|
31
31
|
const existing = this.state.getCliWindow(request.task_id, provider.id);
|
|
@@ -52,7 +52,7 @@ export class SessionManager {
|
|
|
52
52
|
const sessionKey = `${request.task_id}:${request.agent_type.toLowerCase()}`;
|
|
53
53
|
const provider = resolveProvider(request.agent_type);
|
|
54
54
|
if (this.config.capabilities.length > 0 && !this.config.capabilities.includes(provider.id)) {
|
|
55
|
-
throw new Error(`CLI
|
|
55
|
+
throw new Error(`CLI 不可用：本机 Agent 未检测到 ${provider.id} CLI`);
|
|
56
56
|
}
|
|
57
57
|
const providerSessionId = request.session_id?.trim();
|
|
58
58
|
if (!providerSessionId) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { mkdtemp, writeFile } from 'node:fs/promises';
|
|
2
|
+
import { tmpdir } from 'node:os';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { afterEach, describe, expect, it } from 'vitest';
|
|
5
|
+
import { loadAgentConfig } from '../src/config.js';
|
|
6
|
+
const ENV_KEYS = [
|
|
7
|
+
'ECHO_AGENT_CONFIG',
|
|
8
|
+
'ECHO_AGENT_DATA_DIR',
|
|
9
|
+
'ECHO_AGENT_CAPABILITIES',
|
|
10
|
+
'ECHO_AGENT_HEALTH_PORT',
|
|
11
|
+
'API_OCRA_DATA_DIR',
|
|
12
|
+
'API_OCRA_CAPABILITIES',
|
|
13
|
+
'API_OCRA_HEALTH_PORT'
|
|
14
|
+
];
|
|
15
|
+
const originalEnvironment = new Map(ENV_KEYS.map((key) => [key, process.env[key]]));
|
|
16
|
+
afterEach(() => {
|
|
17
|
+
for (const key of ENV_KEYS) {
|
|
18
|
+
const value = originalEnvironment.get(key);
|
|
19
|
+
if (value === undefined)
|
|
20
|
+
delete process.env[key];
|
|
21
|
+
else
|
|
22
|
+
process.env[key] = value;
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
describe('legacy api_user environment compatibility', () => {
|
|
26
|
+
it('loads the API_OCRA variables used by the proven desktop route launcher', async () => {
|
|
27
|
+
const directory = await mkdtemp(join(tmpdir(), 'echo-agent-config-'));
|
|
28
|
+
const configPath = join(directory, 'config.json');
|
|
29
|
+
await writeFile(configPath, JSON.stringify({
|
|
30
|
+
wsUrl: 'wss://example.test/ws/echo',
|
|
31
|
+
authMode: 'bearer',
|
|
32
|
+
authToken: 'token',
|
|
33
|
+
deviceId: 'device-air',
|
|
34
|
+
deviceName: 'air'
|
|
35
|
+
}));
|
|
36
|
+
process.env.ECHO_AGENT_CONFIG = configPath;
|
|
37
|
+
delete process.env.ECHO_AGENT_DATA_DIR;
|
|
38
|
+
delete process.env.ECHO_AGENT_CAPABILITIES;
|
|
39
|
+
delete process.env.ECHO_AGENT_HEALTH_PORT;
|
|
40
|
+
process.env.API_OCRA_DATA_DIR = directory;
|
|
41
|
+
process.env.API_OCRA_CAPABILITIES = 'Claude,Codex';
|
|
42
|
+
process.env.API_OCRA_HEALTH_PORT = '18765';
|
|
43
|
+
const config = loadAgentConfig();
|
|
44
|
+
expect(config.deviceId).toBe('device-air');
|
|
45
|
+
expect(config.capabilities).toEqual(['claude', 'codex']);
|
|
46
|
+
expect(config.healthPort).toBe(18765);
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
//# sourceMappingURL=config-compatibility.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-compatibility.test.js","sourceRoot":"","sources":["../../tests/config-compatibility.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,QAAQ,GAAG;IACf,mBAAmB;IACnB,qBAAqB;IACrB,yBAAyB;IACzB,wBAAwB;IACxB,mBAAmB;IACnB,uBAAuB;IACvB,sBAAsB;CACd,CAAA;AAEV,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;AAEnF,SAAS,CAAC,GAAG,EAAE;IACb,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC1C,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;;YAC3C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IAC/B,CAAC;AACH,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACzD,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;QACtF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAAA;QACrE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACjD,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;YACzC,KAAK,EAAE,4BAA4B;YACnC,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,YAAY;YACtB,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC,CAAA;QAEH,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,UAAU,CAAA;QAC1C,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAA;QACtC,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAA;QAC1C,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAA;QACzC,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,SAAS,CAAA;QACzC,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,cAAc,CAAA;QAClD,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,OAAO,CAAA;QAE1C,MAAM,MAAM,GAAG,eAAe,EAAE,CAAA;QAChC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC1C,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAA;QACxD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { selectCapabilities } from '../src/runtime/agent-runtime.js';
|
|
3
|
+
describe('Agent capability selection', () => {
|
|
4
|
+
it('keeps the launcher-provided CLI list after normalization', () => {
|
|
5
|
+
expect(selectCapabilities(['Codex', 'codex', ' Claude '], [
|
|
6
|
+
{ id: 'kiro', available: true }
|
|
7
|
+
])).toEqual(['codex', 'claude']);
|
|
8
|
+
});
|
|
9
|
+
it('auto-detects installed CLIs for system-service launches without capabilities', () => {
|
|
10
|
+
expect(selectCapabilities([], [
|
|
11
|
+
{ id: 'codex', available: true },
|
|
12
|
+
{ id: 'claude', available: false },
|
|
13
|
+
{ id: 'kiro', available: true }
|
|
14
|
+
])).toEqual(['codex', 'kiro']);
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
//# sourceMappingURL=runtime-capabilities.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-capabilities.test.js","sourceRoot":"","sources":["../../tests/runtime-capabilities.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AAEpE,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE;YACxD,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;SAChC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8EAA8E,EAAE,GAAG,EAAE;QACtF,MAAM,CAAC,kBAAkB,CAAC,EAAE,EAAE;YAC5B,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE;YAChC,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE;YAClC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;SAChC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IAChC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "echo-cli-agent",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.3",
|
|
4
4
|
"description": "Local CLI bridge agent",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
"doctor": "tsx src/index.ts doctor",
|
|
20
20
|
"service:install": "node scripts/service.mjs install",
|
|
21
21
|
"service:uninstall": "node scripts/service.mjs uninstall",
|
|
22
|
+
"publish:latest": "node ./publish-npm.mjs",
|
|
22
23
|
"typecheck": "tsc -p tsconfig.json --noEmit",
|
|
23
24
|
"test": "vitest run",
|
|
24
25
|
"test:watch": "vitest"
|