agents-bridge 0.1.0 → 0.1.2
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/LICENSE +21 -21
- package/README.md +162 -131
- package/bin/agent-bridge.mjs +11 -11
- package/config.example.json +22 -55
- package/config.multi-agent.example.json +67 -0
- package/dist/agents/agent-resolver.d.ts +12 -0
- package/dist/agents/agent-resolver.d.ts.map +1 -0
- package/dist/agents/agent-resolver.js +114 -0
- package/dist/agents/agent-resolver.js.map +1 -0
- package/dist/agents/agent-router.d.ts +8 -0
- package/dist/agents/agent-router.d.ts.map +1 -0
- package/dist/agents/agent-router.js +72 -0
- package/dist/agents/agent-router.js.map +1 -0
- package/dist/agents/cli-backends.d.ts +20 -27
- package/dist/agents/cli-backends.d.ts.map +1 -1
- package/dist/agents/cli-backends.js +29 -4
- package/dist/agents/cli-backends.js.map +1 -1
- package/dist/agents/cli-output.d.ts +35 -0
- package/dist/agents/cli-output.d.ts.map +1 -0
- package/dist/agents/cli-output.js +277 -0
- package/dist/agents/cli-output.js.map +1 -0
- package/dist/agents/cli-output.test.d.ts +2 -0
- package/dist/agents/cli-output.test.d.ts.map +1 -0
- package/dist/agents/cli-output.test.js +56 -0
- package/dist/agents/cli-output.test.js.map +1 -0
- package/dist/agents/cli-runner.d.ts +23 -0
- package/dist/agents/cli-runner.d.ts.map +1 -1
- package/dist/agents/cli-runner.js +244 -153
- package/dist/agents/cli-runner.js.map +1 -1
- package/dist/agents/cli-runner.test.d.ts +2 -0
- package/dist/agents/cli-runner.test.d.ts.map +1 -0
- package/dist/agents/cli-runner.test.js +119 -0
- package/dist/agents/cli-runner.test.js.map +1 -0
- package/dist/agents/cli-session-store.d.ts +47 -0
- package/dist/agents/cli-session-store.d.ts.map +1 -1
- package/dist/agents/cli-session-store.js +72 -0
- package/dist/agents/cli-session-store.js.map +1 -1
- package/dist/agents/cli-session-store.test.d.ts +2 -0
- package/dist/agents/cli-session-store.test.d.ts.map +1 -0
- package/dist/agents/cli-session-store.test.js +30 -0
- package/dist/agents/cli-session-store.test.js.map +1 -0
- package/dist/agents/codex-app-server-runtime.d.ts +72 -0
- package/dist/agents/codex-app-server-runtime.d.ts.map +1 -0
- package/dist/agents/codex-app-server-runtime.js +772 -0
- package/dist/agents/codex-app-server-runtime.js.map +1 -0
- package/dist/agents/codex-app-server-runtime.test.d.ts +2 -0
- package/dist/agents/codex-app-server-runtime.test.d.ts.map +1 -0
- package/dist/agents/codex-app-server-runtime.test.js +164 -0
- package/dist/agents/codex-app-server-runtime.test.js.map +1 -0
- package/dist/agents/model-selection.d.ts +3 -2
- package/dist/agents/model-selection.js +1 -1
- package/dist/channels/botlink.d.ts +2 -0
- package/dist/channels/botlink.js +73 -60
- package/dist/channels/botlink.js.map +1 -1
- package/dist/cli/cmd-doctor.d.ts.map +1 -1
- package/dist/cli/cmd-doctor.js +41 -5
- package/dist/cli/cmd-doctor.js.map +1 -1
- package/dist/cli/cmd-logs.js +1 -1
- package/dist/cli/cmd-logs.js.map +1 -1
- package/dist/cli/cmd-onboard.d.ts.map +1 -1
- package/dist/cli/cmd-onboard.js +16 -10
- package/dist/cli/cmd-onboard.js.map +1 -1
- package/dist/cli/cmd-start.d.ts.map +1 -1
- package/dist/cli/cmd-start.js +205 -32
- package/dist/cli/cmd-start.js.map +1 -1
- package/dist/cli/run-main.js +27 -27
- package/dist/config/agent-dirs.d.ts +12 -0
- package/dist/config/agent-dirs.d.ts.map +1 -1
- package/dist/config/agent-dirs.js +43 -2
- package/dist/config/agent-dirs.js.map +1 -1
- package/dist/config/config.js +1 -1
- package/dist/config/config.js.map +1 -1
- package/dist/config/merge-config.d.ts.map +1 -1
- package/dist/config/merge-config.js +16 -4
- package/dist/config/merge-config.js.map +1 -1
- package/dist/config/paths.d.ts +4 -0
- package/dist/config/paths.d.ts.map +1 -1
- package/dist/config/paths.js +7 -0
- package/dist/config/paths.js.map +1 -1
- package/dist/config/zod-schema.d.ts +2158 -239
- package/dist/config/zod-schema.d.ts.map +1 -1
- package/dist/config/zod-schema.js +100 -1
- package/dist/config/zod-schema.js.map +1 -1
- package/dist/entry.d.ts +1 -1
- package/dist/logger.d.ts +1 -0
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +28 -5
- package/dist/logger.js.map +1 -1
- package/dist/types/index.d.ts +130 -3
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +55 -54
- package/dist/console-encoding.d.ts +0 -6
- package/dist/console-encoding.d.ts.map +0 -1
- package/dist/console-encoding.js +0 -35
- package/dist/console-encoding.js.map +0 -1
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { agentStatePath } from '../config/paths.js';
|
|
2
|
+
const PROTECTED_KEYS = new Set(['__proto__', 'constructor', 'prototype']);
|
|
3
|
+
/**
|
|
4
|
+
* Resolve agent configurations: merge defaults + list → Map<agentId, ResolvedAgent>.
|
|
5
|
+
* Called once at startup, result cached for routing.
|
|
6
|
+
*/
|
|
7
|
+
export function resolveAgentConfigs(config, logger) {
|
|
8
|
+
const defaults = config.agents.defaults;
|
|
9
|
+
const list = config.agents.list;
|
|
10
|
+
const bindings = config.bindings;
|
|
11
|
+
// No list → implicit "default" agent from defaults
|
|
12
|
+
if (!list || list.length === 0) {
|
|
13
|
+
const agent = buildResolvedAgent('default', defaults, undefined);
|
|
14
|
+
validateBindingRefs(bindings, new Set(['default']));
|
|
15
|
+
return { agents: new Map([['default', agent]]), defaultAgentId: 'default' };
|
|
16
|
+
}
|
|
17
|
+
// Validate uniqueness
|
|
18
|
+
const idSet = new Set();
|
|
19
|
+
for (const entry of list) {
|
|
20
|
+
if (idSet.has(entry.id)) {
|
|
21
|
+
throw new Error(`Duplicate agentId: "${entry.id}"`);
|
|
22
|
+
}
|
|
23
|
+
idSet.add(entry.id);
|
|
24
|
+
}
|
|
25
|
+
// Determine default agent
|
|
26
|
+
const defaultEntries = list.filter((a) => a.default === true);
|
|
27
|
+
if (defaultEntries.length > 1) {
|
|
28
|
+
logger.warn({ agents: defaultEntries.map((a) => a.id) }, 'Multiple agents marked as default, using the first one');
|
|
29
|
+
}
|
|
30
|
+
const defaultAgentId = defaultEntries[0]?.id ?? list[0].id;
|
|
31
|
+
// Merge each agent with defaults
|
|
32
|
+
const agents = new Map();
|
|
33
|
+
for (const entry of list) {
|
|
34
|
+
agents.set(entry.id, buildResolvedAgent(entry.id, defaults, entry));
|
|
35
|
+
}
|
|
36
|
+
// Validate binding references
|
|
37
|
+
validateBindingRefs(bindings, idSet);
|
|
38
|
+
return { agents, defaultAgentId };
|
|
39
|
+
}
|
|
40
|
+
function buildResolvedAgent(id, defaults, agentConfig) {
|
|
41
|
+
const model = resolveModel(defaults.model, agentConfig?.model);
|
|
42
|
+
const cliBackends = deepMergeRecords(defaults.cliBackends ?? {}, (agentConfig?.cliBackends ?? {}));
|
|
43
|
+
const env = { ...(defaults.env ?? {}), ...(agentConfig?.env ?? {}) };
|
|
44
|
+
const clearEnv = [...(defaults.clearEnv ?? []), ...(agentConfig?.clearEnv ?? [])];
|
|
45
|
+
return {
|
|
46
|
+
id,
|
|
47
|
+
name: agentConfig?.name ?? id,
|
|
48
|
+
model,
|
|
49
|
+
workspace: agentConfig?.workspace ?? process.cwd(),
|
|
50
|
+
cliSessionId: agentConfig?.cliSessionId,
|
|
51
|
+
systemPrompt: agentConfig?.systemPrompt,
|
|
52
|
+
cliBackends,
|
|
53
|
+
env,
|
|
54
|
+
clearEnv,
|
|
55
|
+
tools: agentConfig?.tools ?? defaults.tools,
|
|
56
|
+
skills: agentConfig?.skills,
|
|
57
|
+
identity: agentConfig?.identity,
|
|
58
|
+
stateDir: agentStatePath(id),
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
function resolveModel(defaultModel, agentModel) {
|
|
62
|
+
if (!agentModel) {
|
|
63
|
+
return { ...defaultModel };
|
|
64
|
+
}
|
|
65
|
+
if (typeof agentModel === 'string') {
|
|
66
|
+
return { primary: agentModel };
|
|
67
|
+
}
|
|
68
|
+
return { ...agentModel };
|
|
69
|
+
}
|
|
70
|
+
function deepMergeRecords(base, override) {
|
|
71
|
+
const result = { ...base };
|
|
72
|
+
for (const [key, value] of Object.entries(override)) {
|
|
73
|
+
if (PROTECTED_KEYS.has(key))
|
|
74
|
+
continue;
|
|
75
|
+
const existing = result[key];
|
|
76
|
+
if (existing && isPlainObject(value)) {
|
|
77
|
+
result[key] = deepMerge(existing, value);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
result[key] = value;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return result;
|
|
84
|
+
}
|
|
85
|
+
function deepMerge(base, override) {
|
|
86
|
+
const result = { ...base };
|
|
87
|
+
for (const [key, value] of Object.entries(override)) {
|
|
88
|
+
if (PROTECTED_KEYS.has(key))
|
|
89
|
+
continue;
|
|
90
|
+
if (value === null) {
|
|
91
|
+
delete result[key];
|
|
92
|
+
}
|
|
93
|
+
else if (isPlainObject(value) && isPlainObject(result[key])) {
|
|
94
|
+
result[key] = deepMerge(result[key], value);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
result[key] = value;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
return result;
|
|
101
|
+
}
|
|
102
|
+
function isPlainObject(value) {
|
|
103
|
+
return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
|
|
104
|
+
}
|
|
105
|
+
function validateBindingRefs(bindings, validIds) {
|
|
106
|
+
if (!bindings)
|
|
107
|
+
return;
|
|
108
|
+
for (const binding of bindings) {
|
|
109
|
+
if (!validIds.has(binding.agentId)) {
|
|
110
|
+
throw new Error(`Binding references unknown agentId "${binding.agentId}". Valid ids: ${[...validIds].join(', ')}`);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
//# sourceMappingURL=agent-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-resolver.js","sourceRoot":"","sources":["../../src/agents/agent-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { AgentBinding } from '../config/zod-schema.js';
|
|
2
|
+
import type { ResolvedAgent, SessionEnvelope } from '../types/index.js';
|
|
3
|
+
/**
|
|
4
|
+
* Route an incoming envelope to the appropriate agent.
|
|
5
|
+
* Uses specificity scoring: higher score wins, ties broken by config order.
|
|
6
|
+
*/
|
|
7
|
+
export declare function resolveAgent(envelope: SessionEnvelope, bindings: AgentBinding[], agents: Map<string, ResolvedAgent>, defaultAgentId: string): ResolvedAgent;
|
|
8
|
+
//# sourceMappingURL=agent-router.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-router.d.ts","sourceRoot":"","sources":["../../src/agents/agent-router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAUvE;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,YAAY,EAAE,EACxB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAClC,cAAc,EAAE,MAAM,GACrB,aAAa,CAqBf"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Route an incoming envelope to the appropriate agent.
|
|
3
|
+
* Uses specificity scoring: higher score wins, ties broken by config order.
|
|
4
|
+
*/
|
|
5
|
+
export function resolveAgent(envelope, bindings, agents, defaultAgentId) {
|
|
6
|
+
const ctx = extractRouteContext(envelope);
|
|
7
|
+
let bestBinding = null;
|
|
8
|
+
let bestScore = -1;
|
|
9
|
+
for (const binding of bindings) {
|
|
10
|
+
const score = scoreBinding(binding.match, ctx);
|
|
11
|
+
if (score > 0 && score > bestScore) {
|
|
12
|
+
bestScore = score;
|
|
13
|
+
bestBinding = binding;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
const agentId = bestBinding?.agentId ?? defaultAgentId;
|
|
17
|
+
const agent = agents.get(agentId);
|
|
18
|
+
if (!agent) {
|
|
19
|
+
// Should not happen if config validation passed, but guard anyway
|
|
20
|
+
const fallback = agents.get(defaultAgentId);
|
|
21
|
+
return fallback;
|
|
22
|
+
}
|
|
23
|
+
return agent;
|
|
24
|
+
}
|
|
25
|
+
function extractRouteContext(envelope) {
|
|
26
|
+
return {
|
|
27
|
+
channel: envelope.source.channel,
|
|
28
|
+
accountId: envelope.source.accountId,
|
|
29
|
+
chatId: String(envelope.source.chatId),
|
|
30
|
+
chatType: envelope.source.chatType,
|
|
31
|
+
userId: String(envelope.source.userId),
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
function scoreBinding(match, ctx) {
|
|
35
|
+
let score = 0;
|
|
36
|
+
let allSatisfied = true;
|
|
37
|
+
if (match.peer?.id !== undefined) {
|
|
38
|
+
if (String(match.peer.id) === ctx.chatId)
|
|
39
|
+
score += 100;
|
|
40
|
+
else
|
|
41
|
+
allSatisfied = false;
|
|
42
|
+
}
|
|
43
|
+
if (match.userId !== undefined) {
|
|
44
|
+
if (String(match.userId) === ctx.userId)
|
|
45
|
+
score += 80;
|
|
46
|
+
else
|
|
47
|
+
allSatisfied = false;
|
|
48
|
+
}
|
|
49
|
+
if (match.peer?.kind !== undefined) {
|
|
50
|
+
if (match.peer.kind === ctx.chatType)
|
|
51
|
+
score += 40;
|
|
52
|
+
else
|
|
53
|
+
allSatisfied = false;
|
|
54
|
+
}
|
|
55
|
+
if (match.accountId !== undefined) {
|
|
56
|
+
if (match.accountId === ctx.accountId)
|
|
57
|
+
score += 60;
|
|
58
|
+
else
|
|
59
|
+
allSatisfied = false;
|
|
60
|
+
}
|
|
61
|
+
if (match.channel !== undefined) {
|
|
62
|
+
if (match.channel === '*')
|
|
63
|
+
score += 1;
|
|
64
|
+
else if (match.channel === ctx.channel)
|
|
65
|
+
score += 20;
|
|
66
|
+
else
|
|
67
|
+
allSatisfied = false;
|
|
68
|
+
}
|
|
69
|
+
// AND semantics: all specified fields must match
|
|
70
|
+
return allSatisfied ? score : 0;
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=agent-router.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-router.js","sourceRoot":"","sources":["../../src/agents/agent-router.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,32 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
* CLI Backend 装配 — 复用现有 cliBackends 机制
|
|
3
|
-
*
|
|
4
|
-
* 根据 agents.defaults.model 中的 provider 前缀(如 "claude-cli"、"codex-cli"),
|
|
5
|
-
* 从 agents.defaults.cliBackends 中查找对应配置,启动本地 CLI 命令。
|
|
6
|
-
*
|
|
7
|
-
* 首版不做 token 级流式,而是:
|
|
8
|
-
* - 运行期间周期性发 sendChatAction(typing)
|
|
9
|
-
* - 完成后一次性发送最终文本消息
|
|
10
|
-
*
|
|
11
|
-
* TODO: Phase 3 实现
|
|
12
|
-
*/
|
|
1
|
+
import type { AppConfig } from '../config/zod-schema.js';
|
|
13
2
|
import type { CliBackendConfig } from '../types/index.js';
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
3
|
+
export interface ResolvedCliBackend {
|
|
4
|
+
id: string;
|
|
5
|
+
config: CliBackendConfig;
|
|
6
|
+
}
|
|
7
|
+
export declare const CLI_WATCHDOG_MIN_TIMEOUT_MS = 1000;
|
|
8
|
+
export declare const CLI_FRESH_WATCHDOG_DEFAULTS: {
|
|
9
|
+
readonly noOutputTimeoutRatio: 0.8;
|
|
10
|
+
readonly minMs: 180000;
|
|
11
|
+
readonly maxMs: 600000;
|
|
12
|
+
};
|
|
13
|
+
export declare const CLI_RESUME_WATCHDOG_DEFAULTS: {
|
|
14
|
+
readonly noOutputTimeoutRatio: 0.3;
|
|
15
|
+
readonly minMs: 60000;
|
|
16
|
+
readonly maxMs: 180000;
|
|
17
|
+
};
|
|
18
|
+
export declare function normalizeProviderId(provider: string): string;
|
|
19
|
+
export declare function resolveCliBackendIds(cfg?: Pick<AppConfig, 'agents'>): Set<string>;
|
|
18
20
|
export declare function extractProvider(modelRef: string): string;
|
|
19
|
-
/**
|
|
20
|
-
* 从 model reference 中提取 model 名称
|
|
21
|
-
* e.g. "claude-cli/opus-4.6" → "opus-4.6"
|
|
22
|
-
*/
|
|
23
21
|
export declare function extractModel(modelRef: string): string;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
*/
|
|
27
|
-
export declare function isCliBackend(modelRef: string): boolean;
|
|
28
|
-
/**
|
|
29
|
-
* 根据 model reference 查找对应的 CLI backend 配置
|
|
30
|
-
*/
|
|
22
|
+
export declare function isCliBackend(modelRef: string, backends?: Record<string, CliBackendConfig>): boolean;
|
|
23
|
+
export declare function resolveCliBackendConfig(provider: string, cfg?: Pick<AppConfig, 'agents'>, cliBackendsOverride?: Record<string, CliBackendConfig>): ResolvedCliBackend | null;
|
|
31
24
|
export declare function resolveCliBackend(modelRef: string, backends: Record<string, CliBackendConfig> | undefined): CliBackendConfig | undefined;
|
|
32
25
|
//# sourceMappingURL=cli-backends.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-backends.d.ts","sourceRoot":"","sources":["../../src/agents/cli-backends.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEzD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,gBAAgB,CAAA;CACzB;AAwBD,eAAO,MAAM,2BAA2B,OAAQ,CAAA;AAEhD,eAAO,MAAM,2BAA2B;;;;CAI9B,CAAA;AAEV,eAAO,MAAM,4BAA4B;;;;CAI/B,CAAA;
|
|
1
|
+
{"version":3,"file":"cli-backends.d.ts","sourceRoot":"","sources":["../../src/agents/cli-backends.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEzD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,gBAAgB,CAAA;CACzB;AAwBD,eAAO,MAAM,2BAA2B,OAAQ,CAAA;AAEhD,eAAO,MAAM,2BAA2B;;;;CAI9B,CAAA;AAEV,eAAO,MAAM,4BAA4B;;;;CAI/B,CAAA;AA4HV,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiB5D;AAkBD,wBAAgB,oBAAoB,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAOjF;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGxD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAC1C,OAAO,CAYT;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,GAAG,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GACrD,kBAAkB,GAAG,IAAI,CA6B3B;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,SAAS,GACrD,gBAAgB,GAAG,SAAS,CAW9B"}
|
|
@@ -32,13 +32,14 @@ export const CLI_RESUME_WATCHDOG_DEFAULTS = {
|
|
|
32
32
|
};
|
|
33
33
|
const DEFAULT_CLAUDE_BACKEND = {
|
|
34
34
|
command: 'claude',
|
|
35
|
-
|
|
35
|
+
runtimeMode: 'exec',
|
|
36
|
+
args: ['-p', '--verbose', '--output-format', 'stream-json', ...(process.getuid?.() === 0 ? [] : ['--dangerously-skip-permissions'])],
|
|
36
37
|
resumeArgs: [
|
|
37
38
|
'-p',
|
|
38
39
|
'--verbose',
|
|
39
40
|
'--output-format',
|
|
40
41
|
'stream-json',
|
|
41
|
-
'--dangerously-skip-permissions',
|
|
42
|
+
...(process.getuid?.() === 0 ? [] : ['--dangerously-skip-permissions']),
|
|
42
43
|
'--resume',
|
|
43
44
|
'{sessionId}',
|
|
44
45
|
],
|
|
@@ -64,6 +65,7 @@ const DEFAULT_CLAUDE_BACKEND = {
|
|
|
64
65
|
};
|
|
65
66
|
const DEFAULT_CODEX_BACKEND = {
|
|
66
67
|
command: 'codex',
|
|
68
|
+
runtimeMode: 'app-server',
|
|
67
69
|
args: ['exec', '--json', '--color', 'never', '--sandbox', 'read-only', '--skip-git-repo-check'],
|
|
68
70
|
resumeArgs: [
|
|
69
71
|
'exec',
|
|
@@ -83,6 +85,18 @@ const DEFAULT_CODEX_BACKEND = {
|
|
|
83
85
|
sessionMode: 'existing',
|
|
84
86
|
imageArg: '--image',
|
|
85
87
|
imageMode: 'repeat',
|
|
88
|
+
appServer: {
|
|
89
|
+
listen: 'stdio://',
|
|
90
|
+
sessionSource: 'agent-bridge',
|
|
91
|
+
startupTimeoutMs: 15_000,
|
|
92
|
+
requestTimeoutMs: 30_000,
|
|
93
|
+
serviceName: 'agent-bridge',
|
|
94
|
+
experimentalApi: false,
|
|
95
|
+
approvalPolicy: 'never',
|
|
96
|
+
sandbox: 'read-only',
|
|
97
|
+
persistExtendedHistory: false,
|
|
98
|
+
experimentalRawEvents: false,
|
|
99
|
+
},
|
|
86
100
|
reliability: {
|
|
87
101
|
watchdog: {
|
|
88
102
|
fresh: { ...CLI_FRESH_WATCHDOG_DEFAULTS },
|
|
@@ -99,10 +113,21 @@ function mergeBackendConfig(base, override) {
|
|
|
99
113
|
const baseResume = base.reliability?.watchdog?.resume ?? {};
|
|
100
114
|
const overrideFresh = override.reliability?.watchdog?.fresh ?? {};
|
|
101
115
|
const overrideResume = override.reliability?.watchdog?.resume ?? {};
|
|
116
|
+
const baseAppServer = base.appServer ?? {};
|
|
117
|
+
const overrideAppServer = override.appServer ?? {};
|
|
102
118
|
return {
|
|
103
119
|
...base,
|
|
104
120
|
...override,
|
|
105
121
|
args: override.args ?? base.args,
|
|
122
|
+
runtimeMode: override.runtimeMode ?? base.runtimeMode,
|
|
123
|
+
appServer: base.appServer || override.appServer
|
|
124
|
+
? {
|
|
125
|
+
...baseAppServer,
|
|
126
|
+
...overrideAppServer,
|
|
127
|
+
args: overrideAppServer.args ?? baseAppServer.args,
|
|
128
|
+
optOutNotificationMethods: overrideAppServer.optOutNotificationMethods ?? baseAppServer.optOutNotificationMethods,
|
|
129
|
+
}
|
|
130
|
+
: undefined,
|
|
106
131
|
env: { ...base.env, ...override.env },
|
|
107
132
|
modelAliases: { ...base.modelAliases, ...override.modelAliases },
|
|
108
133
|
clearEnv: Array.from(new Set([...(base.clearEnv ?? []), ...(override.clearEnv ?? [])])),
|
|
@@ -175,9 +200,9 @@ export function isCliBackend(modelRef, backends) {
|
|
|
175
200
|
}
|
|
176
201
|
return Object.keys(backends).some((key) => normalizeBackendKey(key) === provider);
|
|
177
202
|
}
|
|
178
|
-
export function resolveCliBackendConfig(provider, cfg) {
|
|
203
|
+
export function resolveCliBackendConfig(provider, cfg, cliBackendsOverride) {
|
|
179
204
|
const normalized = normalizeBackendKey(provider);
|
|
180
|
-
const configured = cfg?.agents.defaults.cliBackends ?? {};
|
|
205
|
+
const configured = cliBackendsOverride ?? cfg?.agents.defaults.cliBackends ?? {};
|
|
181
206
|
const override = pickBackendConfig(configured, normalized);
|
|
182
207
|
if (normalized === 'claude-cli') {
|
|
183
208
|
const merged = mergeBackendConfig(DEFAULT_CLAUDE_BACKEND, override);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-backends.js","sourceRoot":"","sources":["../../src/agents/cli-backends.ts"],"names":[],"mappings":"AAQA,MAAM,oBAAoB,GAA2B;IACnD,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,MAAM;IAClB,QAAQ,EAAE,MAAM;IAChB,iBAAiB,EAAE,MAAM;IACzB,iBAAiB,EAAE,MAAM;IACzB,eAAe,EAAE,MAAM;IACvB,MAAM,EAAE,QAAQ;IAChB,YAAY,EAAE,QAAQ;IACtB,YAAY,EAAE,QAAQ;IACtB,YAAY,EAAE,QAAQ;IACtB,YAAY,EAAE,QAAQ;IACtB,mBAAmB,EAAE,QAAQ;IAC7B,mBAAmB,EAAE,QAAQ;IAC7B,mBAAmB,EAAE,QAAQ;IAC7B,mBAAmB,EAAE,QAAQ;IAC7B,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,OAAO;IACpB,kBAAkB,EAAE,OAAO;CAC5B,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,CAAA;AAEhD,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,oBAAoB,EAAE,GAAG;IACzB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;CACN,CAAA;AAEV,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,oBAAoB,EAAE,GAAG;IACzB,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,OAAO;CACN,CAAA;AAEV,MAAM,sBAAsB,GAAqB;IAC/C,OAAO,EAAE,QAAQ;IACjB,IAAI,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli-backends.js","sourceRoot":"","sources":["../../src/agents/cli-backends.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import type { CliBackendConfig, CliRunUsage } from '../types/index.js';
|
|
2
|
+
export interface ParsedCliOutput {
|
|
3
|
+
text: string;
|
|
4
|
+
cliSessionId?: string;
|
|
5
|
+
usage?: CliRunUsage;
|
|
6
|
+
}
|
|
7
|
+
export interface CliOutputProbeSnapshot {
|
|
8
|
+
firstStdoutMs?: number;
|
|
9
|
+
firstStderrMs?: number;
|
|
10
|
+
threadStartedMs?: number;
|
|
11
|
+
firstAgentMessageMs?: number;
|
|
12
|
+
turnCompletedMs?: number;
|
|
13
|
+
reconnectCount: number;
|
|
14
|
+
fellBackToHttps: boolean;
|
|
15
|
+
cliSessionId?: string;
|
|
16
|
+
lastText?: string;
|
|
17
|
+
usage?: CliRunUsage;
|
|
18
|
+
}
|
|
19
|
+
export interface CliOutputProbe {
|
|
20
|
+
onStdout(chunk: string, atMs: number): void;
|
|
21
|
+
onStderr(chunk: string, atMs: number): void;
|
|
22
|
+
snapshot(): CliOutputProbeSnapshot;
|
|
23
|
+
}
|
|
24
|
+
export declare function createCliOutputProbe(params: {
|
|
25
|
+
backend: CliBackendConfig;
|
|
26
|
+
mode: 'json' | 'jsonl' | 'text';
|
|
27
|
+
}): CliOutputProbe;
|
|
28
|
+
export declare function parseCliOutput(raw: string, mode: 'json' | 'jsonl' | 'text', backend: CliBackendConfig): ParsedCliOutput | null;
|
|
29
|
+
export declare function parseCliJson(raw: string, backend: CliBackendConfig): ParsedCliOutput | null;
|
|
30
|
+
export declare function parseCliJsonl(raw: string, backend: CliBackendConfig): ParsedCliOutput | null;
|
|
31
|
+
export declare function pickCliSessionId(parsed: Record<string, unknown>, backend: CliBackendConfig): string | undefined;
|
|
32
|
+
export declare function collectText(value: unknown): string;
|
|
33
|
+
export declare function toUsage(raw: Record<string, unknown>): CliRunUsage | undefined;
|
|
34
|
+
export declare function isSessionExpiredError(error: unknown): boolean;
|
|
35
|
+
//# sourceMappingURL=cli-output.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-output.d.ts","sourceRoot":"","sources":["../../src/agents/cli-output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEtE,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,WAAW,CAAA;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe,EAAE,OAAO,CAAA;IACxB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,WAAW,CAAA;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3C,QAAQ,IAAI,sBAAsB,CAAA;CACnC;AAgBD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IAC3C,OAAO,EAAE,gBAAgB,CAAA;IACzB,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;CAChC,GAAG,cAAc,CAyCjB;AAED,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAC/B,OAAO,EAAE,gBAAgB,GACxB,eAAe,GAAG,IAAI,CAWxB;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,eAAe,GAAG,IAAI,CAyB3F;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,eAAe,GAAG,IAAI,CAsC5F;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,gBAAgB,GACxB,MAAM,GAAG,SAAS,CAyBpB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CA6BlD;AASD,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,GAAG,SAAS,CAsB7E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAG7D"}
|