@marcopeg/hal 1.0.23 → 1.0.25
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 +9 -12
- package/dist/bot/commands/engine-callback.d.ts +4 -0
- package/dist/bot/commands/engine-callback.d.ts.map +1 -0
- package/dist/bot/commands/engine-callback.js +39 -0
- package/dist/bot/commands/engine-callback.js.map +1 -0
- package/dist/bot/commands/engine.d.ts +4 -0
- package/dist/bot/commands/engine.d.ts.map +1 -0
- package/dist/bot/commands/engine.js +65 -0
- package/dist/bot/commands/engine.js.map +1 -0
- package/dist/bot/commands/loader.d.ts +7 -1
- package/dist/bot/commands/loader.d.ts.map +1 -1
- package/dist/bot/commands/loader.js +18 -3
- package/dist/bot/commands/loader.js.map +1 -1
- package/dist/bot/commands/message.d.ts.map +1 -1
- package/dist/bot/commands/message.js +2 -1
- package/dist/bot/commands/message.js.map +1 -1
- package/dist/bot/commands/model-callback.d.ts.map +1 -1
- package/dist/bot/commands/model-callback.js +6 -1
- package/dist/bot/commands/model-callback.js.map +1 -1
- package/dist/bot/commands/model.d.ts.map +1 -1
- package/dist/bot/commands/model.js +15 -2
- package/dist/bot/commands/model.js.map +1 -1
- package/dist/bot/commands/watcher.d.ts.map +1 -1
- package/dist/bot/commands/watcher.js +6 -5
- package/dist/bot/commands/watcher.js.map +1 -1
- package/dist/bot.d.ts.map +1 -1
- package/dist/bot.js +16 -5
- package/dist/bot.js.map +1 -1
- package/dist/cli.js +19 -16
- package/dist/cli.js.map +1 -1
- package/dist/config-writer.d.ts +2 -6
- package/dist/config-writer.d.ts.map +1 -1
- package/dist/config-writer.js +32 -28
- package/dist/config-writer.js.map +1 -1
- package/dist/config.d.ts +103 -56
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +141 -46
- package/dist/config.js.map +1 -1
- package/dist/engine/adapters/codex.d.ts.map +1 -1
- package/dist/engine/adapters/codex.js +4 -2
- package/dist/engine/adapters/codex.js.map +1 -1
- package/dist/engine/adapters/copilot.d.ts.map +1 -1
- package/dist/engine/adapters/copilot.js +8 -5
- package/dist/engine/adapters/copilot.js.map +1 -1
- package/dist/engine/adapters/cursor.d.ts.map +1 -1
- package/dist/engine/adapters/cursor.js +8 -3
- package/dist/engine/adapters/cursor.js.map +1 -1
- package/dist/engine/adapters/opencode.d.ts.map +1 -1
- package/dist/engine/adapters/opencode.js +4 -2
- package/dist/engine/adapters/opencode.js.map +1 -1
- package/dist/user/setup.d.ts.map +1 -1
- package/dist/user/setup.js +5 -1
- package/dist/user/setup.js.map +1 -1
- package/package.json +1 -1
package/dist/bot.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { Bot } from "grammy";
|
|
2
|
+
import { createEngineHandler } from "./bot/commands/engine.js";
|
|
3
|
+
import { createEngineCallbackHandler } from "./bot/commands/engine-callback.js";
|
|
2
4
|
import { createGitCallbackHandler, createGitCleanHandler, createGitCommitHandler, createGitInitHandler, createGitStatusHandler, } from "./bot/commands/git/index.js";
|
|
3
5
|
import { createHelpHandler } from "./bot/commands/help.js";
|
|
4
|
-
import { getCommandsWithDescriptionTooLong, loadCommands, } from "./bot/commands/loader.js";
|
|
6
|
+
import { commandsForTelegramMenu, getCommandsWithDescriptionTooLong, loadCommands, } from "./bot/commands/loader.js";
|
|
5
7
|
import { createModelHandler } from "./bot/commands/model.js";
|
|
6
8
|
import { createModelCallbackHandler } from "./bot/commands/model-callback.js";
|
|
7
9
|
import { createResetCallbackHandler, createResetHandler, } from "./bot/commands/reset.js";
|
|
@@ -52,6 +54,10 @@ export async function startBot(projectCtx) {
|
|
|
52
54
|
bot.command("model", createModelHandler(projectCtx));
|
|
53
55
|
bot.on("callback_query:data", createModelCallbackHandler(projectCtx));
|
|
54
56
|
}
|
|
57
|
+
if (cmd.engine.enabled) {
|
|
58
|
+
bot.command("engine", createEngineHandler(projectCtx));
|
|
59
|
+
bot.on("callback_query:data", createEngineCallbackHandler(projectCtx));
|
|
60
|
+
}
|
|
55
61
|
// Wire handlers
|
|
56
62
|
bot.on("message:text", createTextHandler(projectCtx));
|
|
57
63
|
bot.on("message:photo", createPhotoHandler(projectCtx));
|
|
@@ -89,20 +95,25 @@ export async function startBot(projectCtx) {
|
|
|
89
95
|
clean: cmd.clean.enabled,
|
|
90
96
|
git: cmd.git.enabled,
|
|
91
97
|
model: cmd.model.enabled,
|
|
98
|
+
engine: cmd.engine.enabled,
|
|
92
99
|
};
|
|
93
100
|
// Register project-specific commands and skills with Telegram on startup
|
|
94
101
|
const skillsDirs = engine.skillsDirs(config.cwd);
|
|
95
102
|
const commands = await loadCommands(config.cwd, config.configDir, logger, skillsDirs, enabledFlags);
|
|
96
|
-
|
|
97
|
-
|
|
103
|
+
const commandsForMenu = commandsForTelegramMenu(commands);
|
|
104
|
+
if (commandsForMenu.length > 0) {
|
|
105
|
+
const tooLong = getCommandsWithDescriptionTooLong(commandsForMenu, config.configDir);
|
|
98
106
|
if (tooLong.length > 0) {
|
|
99
107
|
const details = tooLong
|
|
100
108
|
.map((o) => ` /${o.command}: description length ${o.length} (max 256) — ${o.path}`)
|
|
101
109
|
.join("\n");
|
|
102
110
|
throw new Error(`Command description(s) exceed Telegram's 256-character limit:\n${details}`);
|
|
103
111
|
}
|
|
104
|
-
await bot.api.setMyCommands(
|
|
105
|
-
|
|
112
|
+
await bot.api.setMyCommands(commandsForMenu.map((c) => ({
|
|
113
|
+
command: c.command,
|
|
114
|
+
description: c.description,
|
|
115
|
+
})));
|
|
116
|
+
logger.info({ count: commandsForMenu.length }, "Commands registered with Telegram");
|
|
106
117
|
}
|
|
107
118
|
// Start file watcher for hot-reload of command and skill files
|
|
108
119
|
const watcher = startCommandWatcher(bot, config.cwd, config.configDir, logger, skillsDirs, enabledFlags);
|
package/dist/bot.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -3,7 +3,7 @@ import { existsSync } from "node:fs";
|
|
|
3
3
|
import { writeFile } from "node:fs/promises";
|
|
4
4
|
import { join, resolve } from "node:path";
|
|
5
5
|
import { startBot } from "./bot.js";
|
|
6
|
-
import { loadMultiConfig, resolveProjectConfig, tryLoadMultiConfig, validateAccessPolicies, validateProjects, } from "./config.js";
|
|
6
|
+
import { loadMultiConfig, resolveProjectConfig, tryLoadMultiConfig, validateAccessPolicies, validateProjects, validateProviderDefaultUniqueness, } from "./config.js";
|
|
7
7
|
import { startConfigWatcher } from "./config-watcher.js";
|
|
8
8
|
import { evaluateBootTimeShells } from "./context/resolver.js";
|
|
9
9
|
import { getDefaultEngineModel } from "./default-models.js";
|
|
@@ -29,15 +29,14 @@ function buildConfigTemplate(engineName) {
|
|
|
29
29
|
"allowedUserIds": [0]
|
|
30
30
|
}
|
|
31
31
|
},
|
|
32
|
-
"projects":
|
|
33
|
-
{
|
|
34
|
-
"name": "my-project",
|
|
32
|
+
"projects": {
|
|
33
|
+
"my-project": {
|
|
35
34
|
"cwd": ".",
|
|
36
35
|
"telegram": {
|
|
37
36
|
"botToken": "YOUR_BOT_TOKEN_HERE"
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
|
-
|
|
39
|
+
}
|
|
41
40
|
}
|
|
42
41
|
`;
|
|
43
42
|
}
|
|
@@ -71,14 +70,13 @@ Configuration (hal.config.json):
|
|
|
71
70
|
"logging": { "level": "info", "flow": true, "persist": false },
|
|
72
71
|
"rateLimit": { "max": 10, "windowMs": 60000 }
|
|
73
72
|
},
|
|
74
|
-
"projects":
|
|
75
|
-
{
|
|
76
|
-
"name": "my-project",
|
|
73
|
+
"projects": {
|
|
74
|
+
"my-project": {
|
|
77
75
|
"cwd": "./path/to/project",
|
|
78
76
|
"telegram": { "botToken": "your-bot-token" },
|
|
79
77
|
"access": { "allowedUserIds": [123456789] }
|
|
80
78
|
}
|
|
81
|
-
|
|
79
|
+
}
|
|
82
80
|
}
|
|
83
81
|
`);
|
|
84
82
|
}
|
|
@@ -154,7 +152,7 @@ async function runInit(cwd, engineName) {
|
|
|
154
152
|
console.log(`Created ${instrFile}`);
|
|
155
153
|
}
|
|
156
154
|
console.log(`\nNext steps:`);
|
|
157
|
-
console.log(`1. Edit hal.config.json and set your Telegram bot token in projects
|
|
155
|
+
console.log(`1. Edit hal.config.json and set your Telegram bot token in projects.my-project.telegram.botToken`);
|
|
158
156
|
console.log(`2. Set the project cwd to the folder the engine should work in`);
|
|
159
157
|
console.log(`3. Replace 0 in access.allowedUserIds with your Telegram user ID (required)`);
|
|
160
158
|
console.log(`4. Run: npx @marcopeg/hal --cwd ${cwd}`);
|
|
@@ -162,14 +160,17 @@ async function runInit(cwd, engineName) {
|
|
|
162
160
|
}
|
|
163
161
|
async function runBotsForConfig(configDir, loaded, startupLogger) {
|
|
164
162
|
const { config: multiConfig, loadedFiles } = loaded;
|
|
163
|
+
validateProviderDefaultUniqueness(multiConfig);
|
|
165
164
|
const globals = multiConfig.globals ?? {};
|
|
166
|
-
// Resolve all project configs, skip inactive ones
|
|
165
|
+
// Resolve all project configs, skip inactive ones (stable order: sorted keys)
|
|
167
166
|
const rootContext = multiConfig.context;
|
|
168
|
-
const
|
|
167
|
+
const projectKeys = Object.keys(multiConfig.projects).sort();
|
|
168
|
+
const allProjects = projectKeys.map((key) => resolveProjectConfig(key, multiConfig.projects[key], globals, configDir, rootContext, multiConfig.providers));
|
|
169
169
|
const resolvedProjects = allProjects.filter((_, i) => {
|
|
170
|
-
const
|
|
170
|
+
const key = projectKeys[i];
|
|
171
|
+
const project = multiConfig.projects[key];
|
|
171
172
|
if (project.active === false) {
|
|
172
|
-
startupLogger.info(`Skipping inactive project "${project.name ??
|
|
173
|
+
startupLogger.info(`Skipping inactive project "${project.name ?? key}"`);
|
|
173
174
|
return false;
|
|
174
175
|
}
|
|
175
176
|
return true;
|
|
@@ -189,7 +190,9 @@ async function runBotsForConfig(configDir, loaded, startupLogger) {
|
|
|
189
190
|
const shellCache = config.context
|
|
190
191
|
? evaluateBootTimeShells(config.context, logger)
|
|
191
192
|
: {};
|
|
192
|
-
const effectiveModel = config.engineModel ??
|
|
193
|
+
const effectiveModel = config.engineModel ??
|
|
194
|
+
config.providerDefaultModel ??
|
|
195
|
+
getDefaultEngineModel(config.engine);
|
|
193
196
|
const engine = getEngine(config.engine, config.engineCommand, effectiveModel);
|
|
194
197
|
return { config, logger, bootContext: { shellCache }, engine };
|
|
195
198
|
});
|
|
@@ -221,7 +224,7 @@ async function runStart(configDir) {
|
|
|
221
224
|
reloading = true;
|
|
222
225
|
try {
|
|
223
226
|
startupLogger.info("Config change detected");
|
|
224
|
-
await Promise.all(runResult.botHandles.map((h) => h.stop()));
|
|
227
|
+
await Promise.all(runResult.botHandles.map((h) => h.stop().catch(() => { })));
|
|
225
228
|
startupLogger.info("All bots stopped");
|
|
226
229
|
try {
|
|
227
230
|
const result = tryLoadMultiConfig(configDir);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAkB,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpD,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/config-writer.d.ts
CHANGED
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
import type { EngineName } from "./engine/types.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
cwd: string;
|
|
5
|
-
}
|
|
6
|
-
export declare function updateProjectModel(configDir: string, project: ProjectIdentifier, engine: EngineName, model: string): void;
|
|
7
|
-
export {};
|
|
2
|
+
export declare function updateProjectModel(configDir: string, projectSlug: string, engine: EngineName, model: string): void;
|
|
3
|
+
export declare function updateProjectEngine(configDir: string, projectSlug: string, engine: EngineName): void;
|
|
8
4
|
//# sourceMappingURL=config-writer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-writer.d.ts","sourceRoot":"","sources":["../src/config-writer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-writer.d.ts","sourceRoot":"","sources":["../src/config-writer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAmDpD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,MAAM,GACZ,IAAI,CAaN;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,UAAU,GACjB,IAAI,CAaN"}
|
package/dist/config-writer.js
CHANGED
|
@@ -8,12 +8,12 @@ function serializeConfig(data, format) {
|
|
|
8
8
|
// jsonc → plain JSON on write (comments are not preserved)
|
|
9
9
|
return JSON.stringify(data, null, 2);
|
|
10
10
|
}
|
|
11
|
-
|
|
11
|
+
function loadConfigData(configDir) {
|
|
12
12
|
const localResolved = resolveConfigFile(configDir, "hal.config.local");
|
|
13
13
|
const baseResolved = resolveConfigFile(configDir, "hal.config");
|
|
14
14
|
const target = localResolved ?? baseResolved;
|
|
15
15
|
if (!target)
|
|
16
|
-
return;
|
|
16
|
+
return { data: {}, target: null };
|
|
17
17
|
let data;
|
|
18
18
|
try {
|
|
19
19
|
const content = readFileSync(target.path, "utf-8");
|
|
@@ -22,35 +22,39 @@ export function updateProjectModel(configDir, project, engine, model) {
|
|
|
22
22
|
catch {
|
|
23
23
|
data = {};
|
|
24
24
|
}
|
|
25
|
+
return { data, target };
|
|
26
|
+
}
|
|
27
|
+
function getProjectEntry(data, projectSlug) {
|
|
25
28
|
const projects = data.projects;
|
|
26
|
-
if (projects
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
const newEntry = {
|
|
41
|
-
cwd: project.cwd,
|
|
42
|
-
engine: { name: engine, model },
|
|
43
|
-
};
|
|
44
|
-
if (project.name)
|
|
45
|
-
newEntry.name = project.name;
|
|
46
|
-
projects.push(newEntry);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
const engineConfig = data.engine ?? {};
|
|
29
|
+
if (projects === null ||
|
|
30
|
+
typeof projects !== "object" ||
|
|
31
|
+
Array.isArray(projects))
|
|
32
|
+
return undefined;
|
|
33
|
+
return projects[projectSlug];
|
|
34
|
+
}
|
|
35
|
+
export function updateProjectModel(configDir, projectSlug, engine, model) {
|
|
36
|
+
const { data, target } = loadConfigData(configDir);
|
|
37
|
+
if (!target)
|
|
38
|
+
return;
|
|
39
|
+
const entry = getProjectEntry(data, projectSlug);
|
|
40
|
+
if (entry) {
|
|
41
|
+
const engineConfig = entry.engine ?? {};
|
|
51
42
|
engineConfig.name = engine;
|
|
52
43
|
engineConfig.model = model;
|
|
53
|
-
|
|
44
|
+
entry.engine = engineConfig;
|
|
45
|
+
}
|
|
46
|
+
writeFileSync(target.path, serializeConfig(data, target.format), "utf-8");
|
|
47
|
+
}
|
|
48
|
+
export function updateProjectEngine(configDir, projectSlug, engine) {
|
|
49
|
+
const { data, target } = loadConfigData(configDir);
|
|
50
|
+
if (!target)
|
|
51
|
+
return;
|
|
52
|
+
const entry = getProjectEntry(data, projectSlug);
|
|
53
|
+
if (entry) {
|
|
54
|
+
const engineConfig = entry.engine ?? {};
|
|
55
|
+
engineConfig.name = engine;
|
|
56
|
+
delete engineConfig.model;
|
|
57
|
+
entry.engine = engineConfig;
|
|
54
58
|
}
|
|
55
59
|
writeFileSync(target.path, serializeConfig(data, target.format), "utf-8");
|
|
56
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-writer.js","sourceRoot":"","sources":["../src/config-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAEL,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"config-writer.js","sourceRoot":"","sources":["../src/config-writer.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -7,6 +7,38 @@ declare const EngineNameSchema: z.ZodEnum<{
|
|
|
7
7
|
cursor: "cursor";
|
|
8
8
|
antigravity: "antigravity";
|
|
9
9
|
}>;
|
|
10
|
+
declare const ProvidersConfigSchema: z.ZodOptional<z.ZodObject<{
|
|
11
|
+
claude: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
12
|
+
name: z.ZodString;
|
|
13
|
+
description: z.ZodOptional<z.ZodString>;
|
|
14
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
15
|
+
}, z.core.$strip>>>;
|
|
16
|
+
copilot: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
17
|
+
name: z.ZodString;
|
|
18
|
+
description: z.ZodOptional<z.ZodString>;
|
|
19
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
20
|
+
}, z.core.$strip>>>;
|
|
21
|
+
codex: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
22
|
+
name: z.ZodString;
|
|
23
|
+
description: z.ZodOptional<z.ZodString>;
|
|
24
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
25
|
+
}, z.core.$strip>>>;
|
|
26
|
+
opencode: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
27
|
+
name: z.ZodString;
|
|
28
|
+
description: z.ZodOptional<z.ZodString>;
|
|
29
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
30
|
+
}, z.core.$strip>>>;
|
|
31
|
+
cursor: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
32
|
+
name: z.ZodString;
|
|
33
|
+
description: z.ZodOptional<z.ZodString>;
|
|
34
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
35
|
+
}, z.core.$strip>>>;
|
|
36
|
+
antigravity: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
37
|
+
name: z.ZodString;
|
|
38
|
+
description: z.ZodOptional<z.ZodString>;
|
|
39
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
40
|
+
}, z.core.$strip>>>;
|
|
41
|
+
}, z.core.$strip>>;
|
|
10
42
|
declare const GlobalsFileSchema: z.ZodOptional<z.ZodObject<{
|
|
11
43
|
access: z.ZodOptional<z.ZodObject<{
|
|
12
44
|
allowedUserIds: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>>;
|
|
@@ -39,32 +71,6 @@ declare const GlobalsFileSchema: z.ZodOptional<z.ZodObject<{
|
|
|
39
71
|
sandbox: z.ZodOptional<z.ZodBoolean>;
|
|
40
72
|
}, z.core.$strip>>>;
|
|
41
73
|
}, z.core.$strip>>;
|
|
42
|
-
providers: z.ZodOptional<z.ZodObject<{
|
|
43
|
-
claude: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
44
|
-
name: z.ZodString;
|
|
45
|
-
description: z.ZodOptional<z.ZodString>;
|
|
46
|
-
}, z.core.$strip>>>;
|
|
47
|
-
copilot: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
48
|
-
name: z.ZodString;
|
|
49
|
-
description: z.ZodOptional<z.ZodString>;
|
|
50
|
-
}, z.core.$strip>>>;
|
|
51
|
-
codex: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
52
|
-
name: z.ZodString;
|
|
53
|
-
description: z.ZodOptional<z.ZodString>;
|
|
54
|
-
}, z.core.$strip>>>;
|
|
55
|
-
opencode: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
56
|
-
name: z.ZodString;
|
|
57
|
-
description: z.ZodOptional<z.ZodString>;
|
|
58
|
-
}, z.core.$strip>>>;
|
|
59
|
-
cursor: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
60
|
-
name: z.ZodString;
|
|
61
|
-
description: z.ZodOptional<z.ZodString>;
|
|
62
|
-
}, z.core.$strip>>>;
|
|
63
|
-
antigravity: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
64
|
-
name: z.ZodString;
|
|
65
|
-
description: z.ZodOptional<z.ZodString>;
|
|
66
|
-
}, z.core.$strip>>>;
|
|
67
|
-
}, z.core.$strip>>;
|
|
68
74
|
logging: z.ZodOptional<z.ZodObject<{
|
|
69
75
|
level: z.ZodOptional<z.ZodEnum<{
|
|
70
76
|
debug: "debug";
|
|
@@ -138,12 +144,15 @@ declare const GlobalsFileSchema: z.ZodOptional<z.ZodObject<{
|
|
|
138
144
|
model: z.ZodOptional<z.ZodObject<{
|
|
139
145
|
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
140
146
|
}, z.core.$strip>>;
|
|
147
|
+
engine: z.ZodOptional<z.ZodObject<{
|
|
148
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
149
|
+
}, z.core.$strip>>;
|
|
141
150
|
}, z.core.$strip>>;
|
|
142
151
|
}, z.core.$strip>>;
|
|
143
152
|
declare const ProjectFileSchema: z.ZodObject<{
|
|
144
153
|
name: z.ZodOptional<z.ZodString>;
|
|
145
154
|
active: z.ZodOptional<z.ZodBoolean>;
|
|
146
|
-
cwd: z.ZodString
|
|
155
|
+
cwd: z.ZodOptional<z.ZodString>;
|
|
147
156
|
telegram: z.ZodObject<{
|
|
148
157
|
botToken: z.ZodString;
|
|
149
158
|
}, z.core.$strip>;
|
|
@@ -182,26 +191,32 @@ declare const ProjectFileSchema: z.ZodObject<{
|
|
|
182
191
|
claude: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
183
192
|
name: z.ZodString;
|
|
184
193
|
description: z.ZodOptional<z.ZodString>;
|
|
194
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
185
195
|
}, z.core.$strip>>>;
|
|
186
196
|
copilot: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
187
197
|
name: z.ZodString;
|
|
188
198
|
description: z.ZodOptional<z.ZodString>;
|
|
199
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
189
200
|
}, z.core.$strip>>>;
|
|
190
201
|
codex: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
191
202
|
name: z.ZodString;
|
|
192
203
|
description: z.ZodOptional<z.ZodString>;
|
|
204
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
193
205
|
}, z.core.$strip>>>;
|
|
194
206
|
opencode: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
195
207
|
name: z.ZodString;
|
|
196
208
|
description: z.ZodOptional<z.ZodString>;
|
|
209
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
197
210
|
}, z.core.$strip>>>;
|
|
198
211
|
cursor: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
199
212
|
name: z.ZodString;
|
|
200
213
|
description: z.ZodOptional<z.ZodString>;
|
|
214
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
201
215
|
}, z.core.$strip>>>;
|
|
202
216
|
antigravity: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
203
217
|
name: z.ZodString;
|
|
204
218
|
description: z.ZodOptional<z.ZodString>;
|
|
219
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
205
220
|
}, z.core.$strip>>>;
|
|
206
221
|
}, z.core.$strip>>;
|
|
207
222
|
logging: z.ZodOptional<z.ZodObject<{
|
|
@@ -278,6 +293,9 @@ declare const ProjectFileSchema: z.ZodObject<{
|
|
|
278
293
|
model: z.ZodOptional<z.ZodObject<{
|
|
279
294
|
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
280
295
|
}, z.core.$strip>>;
|
|
296
|
+
engine: z.ZodOptional<z.ZodObject<{
|
|
297
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
298
|
+
}, z.core.$strip>>;
|
|
281
299
|
}, z.core.$strip>>;
|
|
282
300
|
}, z.core.$strip>;
|
|
283
301
|
declare const MultiConfigFileSchema: z.ZodObject<{
|
|
@@ -313,32 +331,6 @@ declare const MultiConfigFileSchema: z.ZodObject<{
|
|
|
313
331
|
sandbox: z.ZodOptional<z.ZodBoolean>;
|
|
314
332
|
}, z.core.$strip>>>;
|
|
315
333
|
}, z.core.$strip>>;
|
|
316
|
-
providers: z.ZodOptional<z.ZodObject<{
|
|
317
|
-
claude: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
318
|
-
name: z.ZodString;
|
|
319
|
-
description: z.ZodOptional<z.ZodString>;
|
|
320
|
-
}, z.core.$strip>>>;
|
|
321
|
-
copilot: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
322
|
-
name: z.ZodString;
|
|
323
|
-
description: z.ZodOptional<z.ZodString>;
|
|
324
|
-
}, z.core.$strip>>>;
|
|
325
|
-
codex: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
326
|
-
name: z.ZodString;
|
|
327
|
-
description: z.ZodOptional<z.ZodString>;
|
|
328
|
-
}, z.core.$strip>>>;
|
|
329
|
-
opencode: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
330
|
-
name: z.ZodString;
|
|
331
|
-
description: z.ZodOptional<z.ZodString>;
|
|
332
|
-
}, z.core.$strip>>>;
|
|
333
|
-
cursor: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
334
|
-
name: z.ZodString;
|
|
335
|
-
description: z.ZodOptional<z.ZodString>;
|
|
336
|
-
}, z.core.$strip>>>;
|
|
337
|
-
antigravity: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
338
|
-
name: z.ZodString;
|
|
339
|
-
description: z.ZodOptional<z.ZodString>;
|
|
340
|
-
}, z.core.$strip>>>;
|
|
341
|
-
}, z.core.$strip>>;
|
|
342
334
|
logging: z.ZodOptional<z.ZodObject<{
|
|
343
335
|
level: z.ZodOptional<z.ZodEnum<{
|
|
344
336
|
debug: "debug";
|
|
@@ -412,13 +404,48 @@ declare const MultiConfigFileSchema: z.ZodObject<{
|
|
|
412
404
|
model: z.ZodOptional<z.ZodObject<{
|
|
413
405
|
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
414
406
|
}, z.core.$strip>>;
|
|
407
|
+
engine: z.ZodOptional<z.ZodObject<{
|
|
408
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
409
|
+
}, z.core.$strip>>;
|
|
415
410
|
}, z.core.$strip>>;
|
|
416
411
|
}, z.core.$strip>>;
|
|
412
|
+
providers: z.ZodOptional<z.ZodObject<{
|
|
413
|
+
claude: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
414
|
+
name: z.ZodString;
|
|
415
|
+
description: z.ZodOptional<z.ZodString>;
|
|
416
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
417
|
+
}, z.core.$strip>>>;
|
|
418
|
+
copilot: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
419
|
+
name: z.ZodString;
|
|
420
|
+
description: z.ZodOptional<z.ZodString>;
|
|
421
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
422
|
+
}, z.core.$strip>>>;
|
|
423
|
+
codex: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
424
|
+
name: z.ZodString;
|
|
425
|
+
description: z.ZodOptional<z.ZodString>;
|
|
426
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
427
|
+
}, z.core.$strip>>>;
|
|
428
|
+
opencode: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
429
|
+
name: z.ZodString;
|
|
430
|
+
description: z.ZodOptional<z.ZodString>;
|
|
431
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
432
|
+
}, z.core.$strip>>>;
|
|
433
|
+
cursor: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
434
|
+
name: z.ZodString;
|
|
435
|
+
description: z.ZodOptional<z.ZodString>;
|
|
436
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
437
|
+
}, z.core.$strip>>>;
|
|
438
|
+
antigravity: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
439
|
+
name: z.ZodString;
|
|
440
|
+
description: z.ZodOptional<z.ZodString>;
|
|
441
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
442
|
+
}, z.core.$strip>>>;
|
|
443
|
+
}, z.core.$strip>>;
|
|
417
444
|
context: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
418
|
-
projects: z.
|
|
445
|
+
projects: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
419
446
|
name: z.ZodOptional<z.ZodString>;
|
|
420
447
|
active: z.ZodOptional<z.ZodBoolean>;
|
|
421
|
-
cwd: z.ZodString
|
|
448
|
+
cwd: z.ZodOptional<z.ZodString>;
|
|
422
449
|
telegram: z.ZodObject<{
|
|
423
450
|
botToken: z.ZodString;
|
|
424
451
|
}, z.core.$strip>;
|
|
@@ -457,26 +484,32 @@ declare const MultiConfigFileSchema: z.ZodObject<{
|
|
|
457
484
|
claude: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
458
485
|
name: z.ZodString;
|
|
459
486
|
description: z.ZodOptional<z.ZodString>;
|
|
487
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
460
488
|
}, z.core.$strip>>>;
|
|
461
489
|
copilot: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
462
490
|
name: z.ZodString;
|
|
463
491
|
description: z.ZodOptional<z.ZodString>;
|
|
492
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
464
493
|
}, z.core.$strip>>>;
|
|
465
494
|
codex: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
466
495
|
name: z.ZodString;
|
|
467
496
|
description: z.ZodOptional<z.ZodString>;
|
|
497
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
468
498
|
}, z.core.$strip>>>;
|
|
469
499
|
opencode: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
470
500
|
name: z.ZodString;
|
|
471
501
|
description: z.ZodOptional<z.ZodString>;
|
|
502
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
472
503
|
}, z.core.$strip>>>;
|
|
473
504
|
cursor: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
474
505
|
name: z.ZodString;
|
|
475
506
|
description: z.ZodOptional<z.ZodString>;
|
|
507
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
476
508
|
}, z.core.$strip>>>;
|
|
477
509
|
antigravity: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
478
510
|
name: z.ZodString;
|
|
479
511
|
description: z.ZodOptional<z.ZodString>;
|
|
512
|
+
default: z.ZodOptional<z.ZodBoolean>;
|
|
480
513
|
}, z.core.$strip>>>;
|
|
481
514
|
}, z.core.$strip>>;
|
|
482
515
|
logging: z.ZodOptional<z.ZodObject<{
|
|
@@ -553,6 +586,9 @@ declare const MultiConfigFileSchema: z.ZodObject<{
|
|
|
553
586
|
model: z.ZodOptional<z.ZodObject<{
|
|
554
587
|
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
555
588
|
}, z.core.$strip>>;
|
|
589
|
+
engine: z.ZodOptional<z.ZodObject<{
|
|
590
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
591
|
+
}, z.core.$strip>>;
|
|
556
592
|
}, z.core.$strip>>;
|
|
557
593
|
}, z.core.$strip>>;
|
|
558
594
|
}, z.core.$strip>;
|
|
@@ -563,6 +599,7 @@ export type EngineName = z.infer<typeof EngineNameSchema>;
|
|
|
563
599
|
export interface ProviderModel {
|
|
564
600
|
name: string;
|
|
565
601
|
description?: string;
|
|
602
|
+
default?: boolean;
|
|
566
603
|
}
|
|
567
604
|
export interface ResolvedProjectConfig {
|
|
568
605
|
slug: string;
|
|
@@ -607,6 +644,8 @@ export interface ResolvedProjectConfig {
|
|
|
607
644
|
} | undefined;
|
|
608
645
|
context: Record<string, string> | undefined;
|
|
609
646
|
providerModels: ProviderModel[];
|
|
647
|
+
providerDefaultModel: string | undefined;
|
|
648
|
+
availableEngines: EngineName[];
|
|
610
649
|
commands: {
|
|
611
650
|
start: {
|
|
612
651
|
enabled: boolean;
|
|
@@ -636,6 +675,9 @@ export interface ResolvedProjectConfig {
|
|
|
636
675
|
model: {
|
|
637
676
|
enabled: boolean;
|
|
638
677
|
};
|
|
678
|
+
engine: {
|
|
679
|
+
enabled: boolean;
|
|
680
|
+
};
|
|
639
681
|
};
|
|
640
682
|
}
|
|
641
683
|
export declare class ConfigLoadError extends Error {
|
|
@@ -646,9 +688,14 @@ export interface LoadedConfigResult {
|
|
|
646
688
|
loadedFiles: string[];
|
|
647
689
|
}
|
|
648
690
|
export declare function deriveSlug(name: string | undefined, cwd: string): string;
|
|
649
|
-
export declare function resolveProjectConfig(project: ProjectFileEntry, globals: GlobalsFile, configDir: string, rootContext?: Record<string, string>): ResolvedProjectConfig;
|
|
691
|
+
export declare function resolveProjectConfig(key: string, project: ProjectFileEntry, globals: GlobalsFile, configDir: string, rootContext?: Record<string, string>, providers?: z.infer<typeof ProvidersConfigSchema>): ResolvedProjectConfig;
|
|
650
692
|
export declare function validateProjects(projects: ResolvedProjectConfig[]): void;
|
|
651
693
|
export declare function validateAccessPolicies(projects: ResolvedProjectConfig[]): void;
|
|
694
|
+
/**
|
|
695
|
+
* Validates that at most one model per providers.<engine> list has default: true.
|
|
696
|
+
* Call after config load and env substitution, before resolving project configs.
|
|
697
|
+
*/
|
|
698
|
+
export declare function validateProviderDefaultUniqueness(config: MultiConfigFile): void;
|
|
652
699
|
export type ConfigFormat = "json" | "jsonc" | "yaml";
|
|
653
700
|
interface ResolvedConfigFile {
|
|
654
701
|
path: string;
|