@gaia-ai/conductor 0.6.2 → 0.6.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.
|
@@ -192,7 +192,7 @@ async function cmdPoll(deps, log = {}) {
|
|
|
192
192
|
return;
|
|
193
193
|
const remote = await resolveRemote(deps, config);
|
|
194
194
|
const executor = deps.executor ?? (await selectExecutor(config, logger));
|
|
195
|
-
const workspace = deps.workspace ?? (await selectWorkspace(config));
|
|
195
|
+
const workspace = deps.workspace ?? (await selectWorkspace(config, logger));
|
|
196
196
|
const agents = deps.agents ?? (await selectAgents(config));
|
|
197
197
|
const conductor = new Conductor(config, remote, executor, workspace, agents, logger, checkoutRoot);
|
|
198
198
|
await conductor.start();
|
|
@@ -206,7 +206,7 @@ async function cmdReap(deps, log = {}) {
|
|
|
206
206
|
return;
|
|
207
207
|
const remote = await resolveRemote(deps, config);
|
|
208
208
|
const executor = deps.executor ?? (await selectExecutor(config, logger));
|
|
209
|
-
const workspace = deps.workspace ?? (await selectWorkspace(config));
|
|
209
|
+
const workspace = deps.workspace ?? (await selectWorkspace(config, logger));
|
|
210
210
|
const agents = deps.agents ?? (await selectAgents(config));
|
|
211
211
|
const conductor = new Conductor(config, remote, executor, workspace, agents, logger, checkoutRoot);
|
|
212
212
|
await conductor.reap();
|
|
@@ -219,7 +219,7 @@ async function cmdStartForeground(deps, log = {}) {
|
|
|
219
219
|
return;
|
|
220
220
|
const remote = await resolveRemote(deps, config);
|
|
221
221
|
const executor = deps.executor ?? (await selectExecutor(config, logger));
|
|
222
|
-
const workspace = deps.workspace ?? (await selectWorkspace(config));
|
|
222
|
+
const workspace = deps.workspace ?? (await selectWorkspace(config, logger));
|
|
223
223
|
const agents = deps.agents ?? (await selectAgents(config));
|
|
224
224
|
const conductor = new Conductor(config, remote, executor, workspace, agents, logger, checkoutRoot);
|
|
225
225
|
await conductor.start();
|
|
@@ -26,7 +26,15 @@ export interface WorkspacePlugin extends DropSHPlugin {
|
|
|
26
26
|
readonly kind: 'workspace';
|
|
27
27
|
readonly id: string;
|
|
28
28
|
readonly requiredModules: string[];
|
|
29
|
-
|
|
29
|
+
/**
|
|
30
|
+
* GAIA-234: `deps` is **optional** so every existing workspace plugin
|
|
31
|
+
* (`addon-workspace-git`, `addon-fake`) keeps compiling untouched — a
|
|
32
|
+
* workspace that logs nothing simply ignores it. It reuses {@link ExecutorDeps}
|
|
33
|
+
* rather than minting a `WorkspaceDeps` alias: that interface is already the
|
|
34
|
+
* contract's name for "runtime deps handed to a plugin factory", and a second
|
|
35
|
+
* identical shape would be two names for one thing.
|
|
36
|
+
*/
|
|
37
|
+
createWorkspace(config: ConductorFileConfig, deps?: ExecutorDeps): Promise<GaiaWorkspace>;
|
|
30
38
|
}
|
|
31
39
|
export interface AgentPlugin extends DropSHPlugin {
|
|
32
40
|
readonly kind: 'agent';
|
|
@@ -38,8 +46,13 @@ export interface AgentPlugin extends DropSHPlugin {
|
|
|
38
46
|
export declare function selectRemote(config: ConductorFileConfig): Promise<GaiaRemote>;
|
|
39
47
|
/** Resolves the executor from its named config slot, injecting the logger. */
|
|
40
48
|
export declare function selectExecutor(config: ConductorFileConfig, logger: ConductorLogger): Promise<GaiaExecutor>;
|
|
41
|
-
/**
|
|
42
|
-
|
|
49
|
+
/**
|
|
50
|
+
* Resolves the workspace from its named config slot, injecting the logger when
|
|
51
|
+
* the caller has one — mirroring {@link selectExecutor}. Without it the herdr
|
|
52
|
+
* workspace's best-effort open-layout warn would land on a noop logger
|
|
53
|
+
* (GAIA-234).
|
|
54
|
+
*/
|
|
55
|
+
export declare function selectWorkspace(config: ConductorFileConfig, logger?: ConductorLogger): Promise<GaiaWorkspace>;
|
|
43
56
|
/** A config-side agent choice: an agent plugin + an optional static priority over the ticket. */
|
|
44
57
|
export interface AgentCandidate {
|
|
45
58
|
agent: AgentPlugin;
|
|
@@ -6,9 +6,14 @@ export async function selectRemote(config) {
|
|
|
6
6
|
export async function selectExecutor(config, logger) {
|
|
7
7
|
return config.executor.createExecutor(config, { logger });
|
|
8
8
|
}
|
|
9
|
-
/**
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
/**
|
|
10
|
+
* Resolves the workspace from its named config slot, injecting the logger when
|
|
11
|
+
* the caller has one — mirroring {@link selectExecutor}. Without it the herdr
|
|
12
|
+
* workspace's best-effort open-layout warn would land on a noop logger
|
|
13
|
+
* (GAIA-234).
|
|
14
|
+
*/
|
|
15
|
+
export async function selectWorkspace(config, logger) {
|
|
16
|
+
return config.workspace.createWorkspace(config, logger ? { logger } : undefined);
|
|
12
17
|
}
|
|
13
18
|
/** A missing `priority` scores strictly below any real number (AC-4). */
|
|
14
19
|
const DEFAULT_PRIORITY = Number.NEGATIVE_INFINITY;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gaia-ai/conductor",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.3",
|
|
4
4
|
"description": "GAIA conductor engine + CLI: registers, claims tickets via JSON:API, dispatches agents.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"directory": "gaia-cli/conductor"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@gaia-ai/core": "^0.6.
|
|
31
|
+
"@gaia-ai/core": "^0.6.3",
|
|
32
32
|
"@dropsh/plugin-oauth2": "^0.5.7",
|
|
33
33
|
"@dropsh/plugin-jsonapi-schema": "^0.5.8",
|
|
34
34
|
"commander": "^12.1.0",
|