@marcopeg/hal 1.0.11 → 1.0.12
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 +121 -32
- package/dist/agent/index.d.ts +5 -7
- package/dist/agent/index.d.ts.map +1 -1
- package/dist/agent/index.js +10 -9
- package/dist/agent/index.js.map +1 -1
- package/dist/bot/commands/loader.d.ts.map +1 -1
- package/dist/bot/commands/loader.js +15 -0
- package/dist/bot/commands/loader.js.map +1 -1
- package/dist/bot/handlers/document.d.ts.map +1 -1
- package/dist/bot/handlers/document.js +4 -6
- package/dist/bot/handlers/document.js.map +1 -1
- package/dist/bot/handlers/photo.d.ts.map +1 -1
- package/dist/bot/handlers/photo.js +4 -6
- package/dist/bot/handlers/photo.js.map +1 -1
- package/dist/bot/handlers/text.d.ts.map +1 -1
- package/dist/bot/handlers/text.js +10 -6
- package/dist/bot/handlers/text.js.map +1 -1
- package/dist/bot/handlers/voice.d.ts.map +1 -1
- package/dist/bot/handlers/voice.js +4 -6
- package/dist/bot/handlers/voice.js.map +1 -1
- package/dist/bot.d.ts.map +1 -1
- package/dist/bot.js +6 -21
- package/dist/bot.js.map +1 -1
- package/dist/cli.js +65 -17
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +56 -19
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +21 -5
- package/dist/config.js.map +1 -1
- package/dist/context/resolver.d.ts.map +1 -1
- package/dist/context/resolver.js +6 -5
- package/dist/context/resolver.js.map +1 -1
- package/dist/engine/adapters/claude.d.ts +3 -0
- package/dist/engine/adapters/claude.d.ts.map +1 -0
- package/dist/engine/adapters/claude.js +241 -0
- package/dist/engine/adapters/claude.js.map +1 -0
- package/dist/engine/adapters/codex.d.ts +7 -0
- package/dist/engine/adapters/codex.d.ts.map +1 -0
- package/dist/engine/adapters/codex.js +94 -0
- package/dist/engine/adapters/codex.js.map +1 -0
- package/dist/engine/adapters/copilot.d.ts +3 -0
- package/dist/engine/adapters/copilot.d.ts.map +1 -0
- package/dist/engine/adapters/copilot.js +109 -0
- package/dist/engine/adapters/copilot.js.map +1 -0
- package/dist/engine/adapters/opencode.d.ts +7 -0
- package/dist/engine/adapters/opencode.d.ts.map +1 -0
- package/dist/engine/adapters/opencode.js +94 -0
- package/dist/engine/adapters/opencode.js.map +1 -0
- package/dist/engine/index.d.ts +4 -0
- package/dist/engine/index.d.ts.map +1 -0
- package/dist/engine/index.js +3 -0
- package/dist/engine/index.js.map +1 -0
- package/dist/engine/prompt.d.ts +9 -0
- package/dist/engine/prompt.d.ts.map +1 -0
- package/dist/engine/prompt.js +29 -0
- package/dist/engine/prompt.js.map +1 -0
- package/dist/engine/registry.d.ts +9 -0
- package/dist/engine/registry.d.ts.map +1 -0
- package/dist/engine/registry.js +24 -0
- package/dist/engine/registry.js.map +1 -0
- package/dist/engine/types.d.ts +42 -0
- package/dist/engine/types.d.ts.map +1 -0
- package/dist/engine/types.js +7 -0
- package/dist/engine/types.js.map +1 -0
- package/dist/types.d.ts +3 -1
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { join, resolve } from "node:path";
|
|
2
2
|
import { createAgent, getSkillsDir } from "../../agent/index.js";
|
|
3
|
-
import { executeClaudeQuery } from "../../claude/executor.js";
|
|
4
3
|
import { resolveContext } from "../../context/resolver.js";
|
|
5
4
|
import { sendChunkedResponse } from "../../telegram/chunker.js";
|
|
6
5
|
import { sendDownloadFiles } from "../../telegram/fileSender.js";
|
|
@@ -17,10 +16,11 @@ export function createTextHandler(ctx) {
|
|
|
17
16
|
if (!userId || !messageText) {
|
|
18
17
|
return;
|
|
19
18
|
}
|
|
20
|
-
logger.
|
|
19
|
+
logger.info({
|
|
21
20
|
userId,
|
|
22
21
|
username: gramCtx.from?.username,
|
|
23
22
|
name: gramCtx.from?.first_name,
|
|
23
|
+
message: messageText,
|
|
24
24
|
}, "Message received");
|
|
25
25
|
// ── Slash command interception ────────────────────────────────────────────
|
|
26
26
|
if (messageText.startsWith("/")) {
|
|
@@ -70,7 +70,7 @@ export function createTextHandler(ctx) {
|
|
|
70
70
|
return;
|
|
71
71
|
}
|
|
72
72
|
// No .mjs handler — check if this is a registered skill
|
|
73
|
-
const skillEntry = await resolveSkillEntry(commandName, getSkillsDir(config.cwd), logger);
|
|
73
|
+
const skillEntry = await resolveSkillEntry(commandName, getSkillsDir(config.cwd, ctx), logger);
|
|
74
74
|
if (skillEntry?.skillPrompt) {
|
|
75
75
|
const prompt = args.length > 0
|
|
76
76
|
? `${skillEntry.skillPrompt}\n\nUser input: ${args.join(" ")}`
|
|
@@ -147,8 +147,8 @@ export function createTextHandler(ctx) {
|
|
|
147
147
|
}
|
|
148
148
|
};
|
|
149
149
|
const downloadsPath = getDownloadsPath(userDir);
|
|
150
|
-
logger.
|
|
151
|
-
const result = await
|
|
150
|
+
logger.info("Executing engine query");
|
|
151
|
+
const result = await ctx.engine.execute({
|
|
152
152
|
prompt: messageText,
|
|
153
153
|
gramCtx,
|
|
154
154
|
userDir,
|
|
@@ -156,7 +156,11 @@ export function createTextHandler(ctx) {
|
|
|
156
156
|
sessionId,
|
|
157
157
|
onProgress,
|
|
158
158
|
}, ctx);
|
|
159
|
-
logger.
|
|
159
|
+
logger.info({
|
|
160
|
+
success: result.success,
|
|
161
|
+
error: result.error,
|
|
162
|
+
response: result.output?.slice(0, 200),
|
|
163
|
+
}, "Engine result");
|
|
160
164
|
try {
|
|
161
165
|
await gramCtx.api.deleteMessage(gramCtx.chat.id, statusMsg.message_id);
|
|
162
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../src/bot/handlers/text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../src/bot/handlers/text.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"voice.d.ts","sourceRoot":"","sources":["../../../src/bot/handlers/voice.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"voice.d.ts","sourceRoot":"","sources":["../../../src/bot/handlers/voice.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAiCrD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,cAAc,IACtC,SAAS,OAAO,KAAG,OAAO,CAAC,IAAI,CAAC,CAsK/C"}
|
|
@@ -2,8 +2,6 @@ import { exec } from "node:child_process";
|
|
|
2
2
|
import { unlink, writeFile } from "node:fs/promises";
|
|
3
3
|
import { join, resolve } from "node:path";
|
|
4
4
|
import { promisify } from "node:util";
|
|
5
|
-
import { executeClaudeQuery } from "../../claude/executor.js";
|
|
6
|
-
import { parseClaudeOutput } from "../../claude/parser.js";
|
|
7
5
|
import { sendChunkedResponse } from "../../telegram/chunker.js";
|
|
8
6
|
import { sendDownloadFiles } from "../../telegram/fileSender.js";
|
|
9
7
|
import { transcribeAudio } from "../../transcription/whisper.js";
|
|
@@ -38,7 +36,7 @@ export function createVoiceHandler(ctx) {
|
|
|
38
36
|
if (!userId || !voice) {
|
|
39
37
|
return;
|
|
40
38
|
}
|
|
41
|
-
logger.
|
|
39
|
+
logger.info({ userId, duration: voice.duration, fileSize: voice.file_size }, "Voice message received");
|
|
42
40
|
const userDir = resolve(join(config.dataDir, String(userId)));
|
|
43
41
|
try {
|
|
44
42
|
await ensureUserSetup(userDir);
|
|
@@ -112,8 +110,8 @@ export function createVoiceHandler(ctx) {
|
|
|
112
110
|
}
|
|
113
111
|
};
|
|
114
112
|
const downloadsPath = getDownloadsPath(userDir);
|
|
115
|
-
logger.
|
|
116
|
-
const result = await
|
|
113
|
+
logger.info({ transcription: transcription.text }, "Executing engine query");
|
|
114
|
+
const result = await ctx.engine.execute({
|
|
117
115
|
prompt: transcription.text,
|
|
118
116
|
gramCtx,
|
|
119
117
|
userDir,
|
|
@@ -127,7 +125,7 @@ export function createVoiceHandler(ctx) {
|
|
|
127
125
|
catch {
|
|
128
126
|
// Ignore delete errors
|
|
129
127
|
}
|
|
130
|
-
const parsed =
|
|
128
|
+
const parsed = ctx.engine.parse(result);
|
|
131
129
|
if (parsed.sessionId) {
|
|
132
130
|
await saveSessionId(userDir, parsed.sessionId);
|
|
133
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"voice.js","sourceRoot":"","sources":["../../../src/bot/handlers/voice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"voice.js","sourceRoot":"","sources":["../../../src/bot/handlers/voice.ts"],"names":[],"mappings":"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"}
|
package/dist/bot.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAqG7E"}
|
package/dist/bot.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import { execSync } from "node:child_process";
|
|
2
1
|
import { Bot } from "grammy";
|
|
3
|
-
import { getSkillsDir } from "./agent/index.js";
|
|
4
2
|
import { createClearHandler } from "./bot/commands/clear.js";
|
|
5
3
|
import { helpHandler } from "./bot/commands/help.js";
|
|
6
4
|
import { loadCommands } from "./bot/commands/loader.js";
|
|
@@ -9,31 +7,18 @@ import { startCommandWatcher } from "./bot/commands/watcher.js";
|
|
|
9
7
|
import { createDocumentHandler, createPhotoHandler, createTextHandler, createVoiceHandler, } from "./bot/handlers/index.js";
|
|
10
8
|
import { createAuthMiddleware } from "./bot/middleware/auth.js";
|
|
11
9
|
import { createRateLimitMiddleware } from "./bot/middleware/rateLimit.js";
|
|
12
|
-
/**
|
|
13
|
-
* Check if the Claude CLI command is available, throwing on failure.
|
|
14
|
-
*/
|
|
15
|
-
function checkClaudeCommand(command) {
|
|
16
|
-
try {
|
|
17
|
-
execSync(`${command} --version`, { stdio: "pipe" });
|
|
18
|
-
}
|
|
19
|
-
catch {
|
|
20
|
-
throw new Error(`Claude CLI command "${command}" not found or not executable. ` +
|
|
21
|
-
`Please ensure Claude Code is installed and the command is in your PATH. ` +
|
|
22
|
-
`You can also set a custom command in hal.config.json under "claude.command".`);
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
10
|
/**
|
|
26
11
|
* Start a single bot for one project context.
|
|
27
12
|
* Resolves when the bot is fully running; rejects if startup fails.
|
|
28
13
|
* Returns a handle with a stop() function for graceful shutdown.
|
|
29
14
|
*/
|
|
30
15
|
export async function startBot(projectCtx) {
|
|
31
|
-
const { config, logger } = projectCtx;
|
|
16
|
+
const { config, logger, engine } = projectCtx;
|
|
32
17
|
logger.info({ cwd: config.cwd, dataDir: config.dataDir }, "Starting bot");
|
|
33
|
-
// Verify
|
|
34
|
-
logger.debug({
|
|
35
|
-
|
|
36
|
-
logger.info({
|
|
18
|
+
// Verify the engine CLI is available (throws on failure)
|
|
19
|
+
logger.debug({ engine: config.engine, command: engine.command }, "Checking engine CLI");
|
|
20
|
+
engine.check();
|
|
21
|
+
logger.info({ engine: config.engine, command: engine.command }, "Engine CLI verified");
|
|
37
22
|
const bot = new Bot(config.telegram.botToken);
|
|
38
23
|
// Wire per-bot middleware
|
|
39
24
|
const { middleware: rateLimitMw, cleanup: rateLimitCleanup } = createRateLimitMiddleware(projectCtx);
|
|
@@ -73,7 +58,7 @@ export async function startBot(projectCtx) {
|
|
|
73
58
|
// Wait until the bot reports it's running (or fails)
|
|
74
59
|
await startedPromise;
|
|
75
60
|
// Register project-specific commands and skills with Telegram on startup
|
|
76
|
-
const skillsDir =
|
|
61
|
+
const skillsDir = engine.skillsDir(config.cwd);
|
|
77
62
|
const commands = await loadCommands(config.cwd, config.configDir, logger, skillsDir);
|
|
78
63
|
if (commands.length > 0) {
|
|
79
64
|
await bot.api.setMyCommands(commands.map((c) => ({ command: c.command, description: c.description })));
|
package/dist/bot.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"bot.js","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAO1E;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,UAA0B;IACvD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAE9C,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC;IAE1E,yDAAyD;IACzD,MAAM,CAAC,KAAK,CACV,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAClD,qBAAqB,CACtB,CAAC;IACF,MAAM,CAAC,KAAK,EAAE,CAAC;IACf,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAClD,qBAAqB,CACtB,CAAC;IAEF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE9C,0BAA0B;IAC1B,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAC1D,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1C,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAErB,gBAAgB;IAChB,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACnC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACjC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IAErD,gBAAgB;IAChB,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;IACtD,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACxD,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9D,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IAExD,gBAAgB;IAChB,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QAChB,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,uDAAuD;IACvD,IAAI,cAA0B,CAAC;IAC/B,IAAI,aAAqC,CAAC;IAC1C,MAAM,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACpD,cAAc,GAAG,GAAG,CAAC;QACrB,aAAa,GAAG,GAAG,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,oDAAoD;IACpD,MAAM,cAAc,GAAG,GAAG;SACvB,KAAK,CAAC;QACL,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;YACnB,MAAM,CAAC,IAAI,CACT,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EACjD,gBAAgB,CACjB,CAAC;YACF,cAAc,EAAE,CAAC;QACnB,CAAC;KACF,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,aAAa,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;IAEL,qDAAqD;IACrD,MAAM,cAAc,CAAC;IAErB,yEAAyE;IACzE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,YAAY,CACjC,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,SAAS,EAChB,MAAM,EACN,SAAS,CACV,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,GAAG,CAAC,GAAG,CAAC,aAAa,CACzB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAC1E,CAAC;QACF,MAAM,CAAC,IAAI,CACT,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,EAC1B,mCAAmC,CACpC,CAAC;IACJ,CAAC;IAED,+DAA+D;IAC/D,MAAM,OAAO,GAAG,mBAAmB,CACjC,GAAG,EACH,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,SAAS,EAChB,MAAM,EACN,SAAS,CACV,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,gBAAgB,EAAE,CAAC;YACnB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,cAAc,CAAC;QACvB,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -5,12 +5,14 @@ import { join, resolve } from "node:path";
|
|
|
5
5
|
import { startBot } from "./bot.js";
|
|
6
6
|
import { loadMultiConfig, resolveProjectConfig, validateProjects, } from "./config.js";
|
|
7
7
|
import { evaluateBootTimeShells } from "./context/resolver.js";
|
|
8
|
+
import { getEngine } from "./engine/index.js";
|
|
8
9
|
import { createProjectLogger, createStartupLogger } from "./logger.js";
|
|
9
10
|
// ─── Config template ──────────────────────────────────────────────────────────
|
|
10
|
-
|
|
11
|
+
function buildConfigTemplate(engineName) {
|
|
12
|
+
return `{
|
|
11
13
|
"globals": {
|
|
12
|
-
"
|
|
13
|
-
"
|
|
14
|
+
"engine": {
|
|
15
|
+
"name": "${engineName}"
|
|
14
16
|
},
|
|
15
17
|
"logging": {
|
|
16
18
|
"level": "info",
|
|
@@ -39,9 +41,10 @@ const CONFIG_TEMPLATE = `{
|
|
|
39
41
|
]
|
|
40
42
|
}
|
|
41
43
|
`;
|
|
44
|
+
}
|
|
42
45
|
function showHelp() {
|
|
43
46
|
console.log(`
|
|
44
|
-
HAL -
|
|
47
|
+
HAL - AI Code Personal Assistant for Telegram
|
|
45
48
|
|
|
46
49
|
Usage:
|
|
47
50
|
npx @marcopeg/hal [command] [options]
|
|
@@ -51,11 +54,13 @@ Commands:
|
|
|
51
54
|
start Start the bots (default)
|
|
52
55
|
|
|
53
56
|
Options:
|
|
54
|
-
--cwd <path>
|
|
55
|
-
--
|
|
57
|
+
--cwd <path> Directory containing hal.config.json (default: current directory)
|
|
58
|
+
--engine <name> Engine to use: claude, copilot, codex, opencode (default: claude)
|
|
59
|
+
--help, -h Show this help message
|
|
56
60
|
|
|
57
61
|
Examples:
|
|
58
62
|
npx @marcopeg/hal init
|
|
63
|
+
npx @marcopeg/hal init --engine copilot
|
|
59
64
|
npx @marcopeg/hal init --cwd ./workspace
|
|
60
65
|
npx @marcopeg/hal
|
|
61
66
|
npx @marcopeg/hal --cwd ./workspace
|
|
@@ -63,7 +68,7 @@ Examples:
|
|
|
63
68
|
Configuration (hal.config.json):
|
|
64
69
|
{
|
|
65
70
|
"globals": {
|
|
66
|
-
"
|
|
71
|
+
"engine": { "name": "claude" },
|
|
67
72
|
"logging": { "level": "info", "flow": true, "persist": false },
|
|
68
73
|
"rateLimit": { "max": 10, "windowMs": 60000 }
|
|
69
74
|
},
|
|
@@ -78,10 +83,17 @@ Configuration (hal.config.json):
|
|
|
78
83
|
}
|
|
79
84
|
`);
|
|
80
85
|
}
|
|
86
|
+
const VALID_ENGINES = [
|
|
87
|
+
"claude",
|
|
88
|
+
"copilot",
|
|
89
|
+
"codex",
|
|
90
|
+
"opencode",
|
|
91
|
+
];
|
|
81
92
|
function parseArgs() {
|
|
82
93
|
const args = process.argv.slice(2);
|
|
83
94
|
let cwd = process.cwd();
|
|
84
95
|
let command = "start";
|
|
96
|
+
let engine = "claude";
|
|
85
97
|
for (let i = 0; i < args.length; i++) {
|
|
86
98
|
const arg = args[i];
|
|
87
99
|
if (arg === "--cwd" && args[i + 1]) {
|
|
@@ -91,6 +103,23 @@ function parseArgs() {
|
|
|
91
103
|
else if (arg.startsWith("--cwd=")) {
|
|
92
104
|
cwd = resolve(process.cwd(), arg.slice(6));
|
|
93
105
|
}
|
|
106
|
+
else if (arg === "--engine" && args[i + 1]) {
|
|
107
|
+
const val = args[i + 1];
|
|
108
|
+
if (!VALID_ENGINES.includes(val)) {
|
|
109
|
+
console.error(`Error: unknown engine "${val}". Valid engines: ${VALID_ENGINES.join(", ")}`);
|
|
110
|
+
process.exit(1);
|
|
111
|
+
}
|
|
112
|
+
engine = val;
|
|
113
|
+
i++;
|
|
114
|
+
}
|
|
115
|
+
else if (arg.startsWith("--engine=")) {
|
|
116
|
+
const val = arg.slice(9);
|
|
117
|
+
if (!VALID_ENGINES.includes(val)) {
|
|
118
|
+
console.error(`Error: unknown engine "${val}". Valid engines: ${VALID_ENGINES.join(", ")}`);
|
|
119
|
+
process.exit(1);
|
|
120
|
+
}
|
|
121
|
+
engine = val;
|
|
122
|
+
}
|
|
94
123
|
else if (arg === "--help" || arg === "-h") {
|
|
95
124
|
showHelp();
|
|
96
125
|
process.exit(0);
|
|
@@ -102,20 +131,30 @@ function parseArgs() {
|
|
|
102
131
|
command = "start";
|
|
103
132
|
}
|
|
104
133
|
}
|
|
105
|
-
return { command, cwd };
|
|
134
|
+
return { command, cwd, engine };
|
|
106
135
|
}
|
|
107
136
|
// ─── init command ─────────────────────────────────────────────────────────────
|
|
108
|
-
async function runInit(cwd) {
|
|
137
|
+
async function runInit(cwd, engineName) {
|
|
109
138
|
const configPath = join(cwd, "hal.config.json");
|
|
110
139
|
if (existsSync(configPath)) {
|
|
111
140
|
console.error(`Error: hal.config.json already exists in ${cwd}`);
|
|
112
141
|
process.exit(1);
|
|
113
142
|
}
|
|
114
|
-
|
|
115
|
-
|
|
143
|
+
// Write config with the selected engine
|
|
144
|
+
const template = buildConfigTemplate(engineName);
|
|
145
|
+
await writeFile(configPath, template, "utf-8");
|
|
146
|
+
console.log(`Created hal.config.json in ${cwd} (engine: ${engineName})`);
|
|
147
|
+
// Scaffold engine-specific instructions file
|
|
148
|
+
const engine = getEngine(engineName);
|
|
149
|
+
const instrFile = engine.instructionsFile();
|
|
150
|
+
const instrPath = join(cwd, instrFile);
|
|
151
|
+
if (!existsSync(instrPath)) {
|
|
152
|
+
await writeFile(instrPath, `# Project Instructions\n\nAdd your project-specific instructions here.\n`, "utf-8");
|
|
153
|
+
console.log(`Created ${instrFile}`);
|
|
154
|
+
}
|
|
116
155
|
console.log(`\nNext steps:`);
|
|
117
156
|
console.log(`1. Edit hal.config.json and set your Telegram bot token in projects[0].telegram.botToken`);
|
|
118
|
-
console.log(`2. Set the project cwd to the folder
|
|
157
|
+
console.log(`2. Set the project cwd to the folder the engine should work in`);
|
|
119
158
|
console.log(`3. Add allowed user IDs to the "allowedUserIds" array`);
|
|
120
159
|
console.log(`4. Run: npx @marcopeg/hal --cwd ${cwd}`);
|
|
121
160
|
process.exit(0);
|
|
@@ -127,9 +166,17 @@ async function runStart(configDir) {
|
|
|
127
166
|
// Load and validate the multi-project config
|
|
128
167
|
const { config: multiConfig, loadedFiles } = loadMultiConfig(configDir);
|
|
129
168
|
const globals = multiConfig.globals ?? {};
|
|
130
|
-
// Resolve all project configs
|
|
169
|
+
// Resolve all project configs, skip inactive ones
|
|
131
170
|
const rootContext = multiConfig.context;
|
|
132
|
-
const
|
|
171
|
+
const allProjects = multiConfig.projects.map((project) => resolveProjectConfig(project, globals, configDir, rootContext));
|
|
172
|
+
const resolvedProjects = allProjects.filter((_, i) => {
|
|
173
|
+
const project = multiConfig.projects[i];
|
|
174
|
+
if (project.active === false) {
|
|
175
|
+
startupLogger.info(`Skipping inactive project "${project.name ?? project.cwd}"`);
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
178
|
+
return true;
|
|
179
|
+
});
|
|
133
180
|
// Boot-time validation (unique cwds, tokens, names)
|
|
134
181
|
validateProjects(resolvedProjects);
|
|
135
182
|
// Boot-time sourcing log
|
|
@@ -147,7 +194,8 @@ async function runStart(configDir) {
|
|
|
147
194
|
const shellCache = config.context
|
|
148
195
|
? evaluateBootTimeShells(config.context, logger)
|
|
149
196
|
: {};
|
|
150
|
-
|
|
197
|
+
const engine = getEngine(config.engine, config.engineCommand, config.engineModel);
|
|
198
|
+
return { config, logger, bootContext: { shellCache }, engine };
|
|
151
199
|
});
|
|
152
200
|
// Emit startup notices for flow=false projects
|
|
153
201
|
for (const { config } of contexts) {
|
|
@@ -177,9 +225,9 @@ async function runStart(configDir) {
|
|
|
177
225
|
}
|
|
178
226
|
// ─── Entry point ──────────────────────────────────────────────────────────────
|
|
179
227
|
async function main() {
|
|
180
|
-
const { command, cwd } = parseArgs();
|
|
228
|
+
const { command, cwd, engine } = parseArgs();
|
|
181
229
|
if (command === "init") {
|
|
182
|
-
await runInit(cwd);
|
|
230
|
+
await runInit(cwd, engine);
|
|
183
231
|
}
|
|
184
232
|
else {
|
|
185
233
|
await runStart(cwd);
|
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;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvE,iFAAiF;AAEjF,
|
|
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;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvE,iFAAiF;AAEjF,SAAS,mBAAmB,CAAC,UAAsB;IACjD,OAAO;;;iBAGQ,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4B1B,CAAC;AACF,CAAC;AAaD,SAAS,QAAQ;IACf,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsCb,CAAC,CAAC;AACH,CAAC;AAED,MAAM,aAAa,GAA0B;IAC3C,QAAQ;IACR,SAAS;IACT,OAAO;IACP,UAAU;CACX,CAAC;AAEF,SAAS,SAAS;IAChB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACxB,IAAI,OAAO,GAAqB,OAAO,CAAC;IACxC,IAAI,MAAM,GAAe,QAAQ,CAAC;IAElC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAEpB,IAAI,GAAG,KAAK,OAAO,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACnC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC1C,CAAC,EAAE,CAAC;QACN,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;aAAM,IAAI,GAAG,KAAK,UAAU,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAe,CAAC;YACtC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjC,OAAO,CAAC,KAAK,CACX,0BAA0B,GAAG,qBAAqB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7E,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,MAAM,GAAG,GAAG,CAAC;YACb,CAAC,EAAE,CAAC;QACN,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAe,CAAC;YACvC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjC,OAAO,CAAC,KAAK,CACX,0BAA0B,GAAG,qBAAqB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7E,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,MAAM,GAAG,GAAG,CAAC;QACf,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC5C,QAAQ,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;aAAM,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YAC1B,OAAO,GAAG,MAAM,CAAC;QACnB,CAAC;aAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YAC3B,OAAO,GAAG,OAAO,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;AAClC,CAAC;AAED,iFAAiF;AAEjF,KAAK,UAAU,OAAO,CAAC,GAAW,EAAE,UAAsB;IACxD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAEhD,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,4CAA4C,GAAG,EAAE,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,wCAAwC;IACxC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACjD,MAAM,SAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,aAAa,UAAU,GAAG,CAAC,CAAC;IAEzE,6CAA6C;IAC7C,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACvC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,SAAS,CACb,SAAS,EACT,0EAA0E,EAC1E,OAAO,CACR,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,WAAW,SAAS,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC7B,OAAO,CAAC,GAAG,CACT,0FAA0F,CAC3F,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;IAC9E,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;IACrE,OAAO,CAAC,GAAG,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,iFAAiF;AAEjF,KAAK,UAAU,QAAQ,CAAC,SAAiB;IACvC,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;IAE5C,aAAa,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,uBAAuB,CAAC,CAAC;IAE3D,6CAA6C;IAC7C,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC;IAE1C,kDAAkD;IAClD,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;IACxC,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACvD,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAC/D,CAAC;IAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC7B,aAAa,CAAC,IAAI,CAChB,8BAA8B,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,GAAG,CAC7D,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,oDAAoD;IACpD,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IAEnC,yBAAyB;IACzB,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,WAAW,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;IACpE,aAAa,CAAC,IAAI,CAAC,2BAA2B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExE,aAAa,CAAC,IAAI,CAChB,EAAE,KAAK,EAAE,gBAAgB,CAAC,MAAM,EAAE,EAClC,sBAAsB,CACvB,CAAC;IAEF,6EAA6E;IAC7E,MAAM,QAAQ,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACjE,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO;YAC/B,CAAC,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,MAAM,GAAG,SAAS,CACtB,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,WAAW,CACnB,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,+CAA+C;IAC/C,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACzB,aAAa,CAAC,IAAI,CAChB,QAAQ,MAAM,CAAC,IAAI,qCAAqC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,mCAAmC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3I,CAAC;QACJ,CAAC;IACH,CAAC;IAED,uDAAuD;IACvD,IAAI,OAAwC,CAAC;IAC7C,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,aAAa,CAAC,KAAK,CACjB,EAAE,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAC3D,6CAA6C,CAC9C,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC;IAElE,4BAA4B;IAC5B,KAAK,UAAU,QAAQ,CAAC,MAAc;QACpC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC;QAC3D,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,iFAAiF;AAEjF,KAAK,UAAU,IAAI;IACjB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAE7C,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,MAAM,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;IAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
package/dist/config.d.ts
CHANGED
|
@@ -1,17 +1,30 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
+
declare const EngineNameSchema: z.ZodEnum<{
|
|
3
|
+
claude: "claude";
|
|
4
|
+
copilot: "copilot";
|
|
5
|
+
codex: "codex";
|
|
6
|
+
opencode: "opencode";
|
|
7
|
+
}>;
|
|
2
8
|
declare const GlobalsFileSchema: z.ZodOptional<z.ZodObject<{
|
|
3
9
|
access: z.ZodOptional<z.ZodObject<{
|
|
4
10
|
allowedUserIds: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
|
|
5
11
|
}, z.core.$strip>>;
|
|
6
|
-
|
|
12
|
+
engine: z.ZodOptional<z.ZodObject<{
|
|
13
|
+
name: z.ZodOptional<z.ZodEnum<{
|
|
14
|
+
claude: "claude";
|
|
15
|
+
copilot: "copilot";
|
|
16
|
+
codex: "codex";
|
|
17
|
+
opencode: "opencode";
|
|
18
|
+
}>>;
|
|
7
19
|
command: z.ZodOptional<z.ZodString>;
|
|
20
|
+
model: z.ZodOptional<z.ZodString>;
|
|
8
21
|
}, z.core.$strip>>;
|
|
9
22
|
logging: z.ZodOptional<z.ZodObject<{
|
|
10
23
|
level: z.ZodOptional<z.ZodEnum<{
|
|
11
|
-
error: "error";
|
|
12
|
-
warn: "warn";
|
|
13
|
-
info: "info";
|
|
14
24
|
debug: "debug";
|
|
25
|
+
info: "info";
|
|
26
|
+
warn: "warn";
|
|
27
|
+
error: "error";
|
|
15
28
|
}>>;
|
|
16
29
|
flow: z.ZodOptional<z.ZodBoolean>;
|
|
17
30
|
persist: z.ZodOptional<z.ZodBoolean>;
|
|
@@ -40,6 +53,7 @@ declare const GlobalsFileSchema: z.ZodOptional<z.ZodObject<{
|
|
|
40
53
|
}, z.core.$strip>>;
|
|
41
54
|
declare const ProjectFileSchema: z.ZodObject<{
|
|
42
55
|
name: z.ZodOptional<z.ZodString>;
|
|
56
|
+
active: z.ZodOptional<z.ZodBoolean>;
|
|
43
57
|
cwd: z.ZodString;
|
|
44
58
|
telegram: z.ZodObject<{
|
|
45
59
|
botToken: z.ZodString;
|
|
@@ -47,15 +61,22 @@ declare const ProjectFileSchema: z.ZodObject<{
|
|
|
47
61
|
access: z.ZodOptional<z.ZodObject<{
|
|
48
62
|
allowedUserIds: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
|
|
49
63
|
}, z.core.$strip>>;
|
|
50
|
-
|
|
64
|
+
engine: z.ZodOptional<z.ZodObject<{
|
|
65
|
+
name: z.ZodOptional<z.ZodEnum<{
|
|
66
|
+
claude: "claude";
|
|
67
|
+
copilot: "copilot";
|
|
68
|
+
codex: "codex";
|
|
69
|
+
opencode: "opencode";
|
|
70
|
+
}>>;
|
|
51
71
|
command: z.ZodOptional<z.ZodString>;
|
|
72
|
+
model: z.ZodOptional<z.ZodString>;
|
|
52
73
|
}, z.core.$strip>>;
|
|
53
74
|
logging: z.ZodOptional<z.ZodObject<{
|
|
54
75
|
level: z.ZodOptional<z.ZodEnum<{
|
|
55
|
-
error: "error";
|
|
56
|
-
warn: "warn";
|
|
57
|
-
info: "info";
|
|
58
76
|
debug: "debug";
|
|
77
|
+
info: "info";
|
|
78
|
+
warn: "warn";
|
|
79
|
+
error: "error";
|
|
59
80
|
}>>;
|
|
60
81
|
flow: z.ZodOptional<z.ZodBoolean>;
|
|
61
82
|
persist: z.ZodOptional<z.ZodBoolean>;
|
|
@@ -88,15 +109,22 @@ declare const MultiConfigFileSchema: z.ZodObject<{
|
|
|
88
109
|
access: z.ZodOptional<z.ZodObject<{
|
|
89
110
|
allowedUserIds: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
|
|
90
111
|
}, z.core.$strip>>;
|
|
91
|
-
|
|
112
|
+
engine: z.ZodOptional<z.ZodObject<{
|
|
113
|
+
name: z.ZodOptional<z.ZodEnum<{
|
|
114
|
+
claude: "claude";
|
|
115
|
+
copilot: "copilot";
|
|
116
|
+
codex: "codex";
|
|
117
|
+
opencode: "opencode";
|
|
118
|
+
}>>;
|
|
92
119
|
command: z.ZodOptional<z.ZodString>;
|
|
120
|
+
model: z.ZodOptional<z.ZodString>;
|
|
93
121
|
}, z.core.$strip>>;
|
|
94
122
|
logging: z.ZodOptional<z.ZodObject<{
|
|
95
123
|
level: z.ZodOptional<z.ZodEnum<{
|
|
96
|
-
error: "error";
|
|
97
|
-
warn: "warn";
|
|
98
|
-
info: "info";
|
|
99
124
|
debug: "debug";
|
|
125
|
+
info: "info";
|
|
126
|
+
warn: "warn";
|
|
127
|
+
error: "error";
|
|
100
128
|
}>>;
|
|
101
129
|
flow: z.ZodOptional<z.ZodBoolean>;
|
|
102
130
|
persist: z.ZodOptional<z.ZodBoolean>;
|
|
@@ -126,6 +154,7 @@ declare const MultiConfigFileSchema: z.ZodObject<{
|
|
|
126
154
|
context: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
127
155
|
projects: z.ZodArray<z.ZodObject<{
|
|
128
156
|
name: z.ZodOptional<z.ZodString>;
|
|
157
|
+
active: z.ZodOptional<z.ZodBoolean>;
|
|
129
158
|
cwd: z.ZodString;
|
|
130
159
|
telegram: z.ZodObject<{
|
|
131
160
|
botToken: z.ZodString;
|
|
@@ -133,15 +162,22 @@ declare const MultiConfigFileSchema: z.ZodObject<{
|
|
|
133
162
|
access: z.ZodOptional<z.ZodObject<{
|
|
134
163
|
allowedUserIds: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
|
|
135
164
|
}, z.core.$strip>>;
|
|
136
|
-
|
|
165
|
+
engine: z.ZodOptional<z.ZodObject<{
|
|
166
|
+
name: z.ZodOptional<z.ZodEnum<{
|
|
167
|
+
claude: "claude";
|
|
168
|
+
copilot: "copilot";
|
|
169
|
+
codex: "codex";
|
|
170
|
+
opencode: "opencode";
|
|
171
|
+
}>>;
|
|
137
172
|
command: z.ZodOptional<z.ZodString>;
|
|
173
|
+
model: z.ZodOptional<z.ZodString>;
|
|
138
174
|
}, z.core.$strip>>;
|
|
139
175
|
logging: z.ZodOptional<z.ZodObject<{
|
|
140
176
|
level: z.ZodOptional<z.ZodEnum<{
|
|
141
|
-
error: "error";
|
|
142
|
-
warn: "warn";
|
|
143
|
-
info: "info";
|
|
144
177
|
debug: "debug";
|
|
178
|
+
info: "info";
|
|
179
|
+
warn: "warn";
|
|
180
|
+
error: "error";
|
|
145
181
|
}>>;
|
|
146
182
|
flow: z.ZodOptional<z.ZodBoolean>;
|
|
147
183
|
persist: z.ZodOptional<z.ZodBoolean>;
|
|
@@ -173,6 +209,7 @@ declare const MultiConfigFileSchema: z.ZodObject<{
|
|
|
173
209
|
type ProjectFileEntry = z.infer<typeof ProjectFileSchema>;
|
|
174
210
|
type GlobalsFile = NonNullable<z.infer<typeof GlobalsFileSchema>>;
|
|
175
211
|
type MultiConfigFile = z.infer<typeof MultiConfigFileSchema>;
|
|
212
|
+
export type EngineName = z.infer<typeof EngineNameSchema>;
|
|
176
213
|
export interface ResolvedProjectConfig {
|
|
177
214
|
slug: string;
|
|
178
215
|
name: string | undefined;
|
|
@@ -186,9 +223,9 @@ export interface ResolvedProjectConfig {
|
|
|
186
223
|
access: {
|
|
187
224
|
allowedUserIds: number[];
|
|
188
225
|
};
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
226
|
+
engine: EngineName;
|
|
227
|
+
engineCommand: string;
|
|
228
|
+
engineModel: string | undefined;
|
|
192
229
|
logging: {
|
|
193
230
|
level: string;
|
|
194
231
|
flow: boolean;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAsBxB,QAAA,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAsBxB,QAAA,MAAM,gBAAgB;;;;;EAAqD,CAAC;AAW5E,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA4BV,CAAC;AAId,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiCrB,CAAC;AAIH,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAMzB,CAAC;AAiBH,KAAK,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC1D,KAAK,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC;AAClE,KAAK,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAK7D,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/B,MAAM,EAAE;QAAE,cAAc,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACrC,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAC5D,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,aAAa,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;IACzE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CAC7C;AAID,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAID,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CASxE;AAwBD,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,qBAAqB,CAkEvB;AAID,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAgCxE;AA0MD,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,CA0ErE"}
|