@marcopeg/hal 1.0.25 → 1.0.26
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/dist/bot/commands/model-callback.d.ts.map +1 -1
- package/dist/bot/commands/model-callback.js +2 -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 +2 -1
- package/dist/bot/commands/model.js.map +1 -1
- package/dist/bot/commands/tasks.d.ts +5 -0
- package/dist/bot/commands/tasks.d.ts.map +1 -0
- package/dist/bot/commands/tasks.js +123 -0
- package/dist/bot/commands/tasks.js.map +1 -0
- package/dist/bot/handlers/index.d.ts +1 -0
- package/dist/bot/handlers/index.d.ts.map +1 -1
- package/dist/bot/handlers/index.js +1 -0
- package/dist/bot/handlers/index.js.map +1 -1
- package/dist/bot/handlers/mjs-callback.d.ts +15 -0
- package/dist/bot/handlers/mjs-callback.d.ts.map +1 -0
- package/dist/bot/handlers/mjs-callback.js +84 -0
- package/dist/bot/handlers/mjs-callback.js.map +1 -0
- package/dist/bot.d.ts.map +1 -1
- package/dist/bot.js +3 -1
- package/dist/bot.js.map +1 -1
- package/dist/cli.js +185 -57
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +14 -1
- package/dist/config.js.map +1 -1
- package/dist/engine/cli-available.d.ts +6 -0
- package/dist/engine/cli-available.d.ts.map +1 -0
- package/dist/engine/cli-available.js +19 -0
- package/dist/engine/cli-available.js.map +1 -0
- package/dist/engine/opencode-models.d.ts +30 -0
- package/dist/engine/opencode-models.d.ts.map +1 -0
- package/dist/engine/opencode-models.js +96 -0
- package/dist/engine/opencode-models.js.map +1 -0
- package/dist/init-template.yaml +32 -0
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-callback.d.ts","sourceRoot":"","sources":["../../../src/bot/commands/model-callback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"model-callback.d.ts","sourceRoot":"","sources":["../../../src/bot/commands/model-callback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AASrD,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,cAAc,GACzB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAwCrD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { updateProjectModel } from "../../config-writer.js";
|
|
2
|
+
import { getEffectiveProviderModels } from "../../engine/opencode-models.js";
|
|
2
3
|
function escapeHtml(text) {
|
|
3
4
|
return text
|
|
4
5
|
.replace(/&/g, "&")
|
|
@@ -18,7 +19,7 @@ export function createModelCallbackHandler(projectCtx) {
|
|
|
18
19
|
return;
|
|
19
20
|
}
|
|
20
21
|
const modelId = parts.slice(2).join(":");
|
|
21
|
-
const models = config
|
|
22
|
+
const models = getEffectiveProviderModels(config);
|
|
22
23
|
if (models.length > 0 && !models.some((m) => m.name === modelId)) {
|
|
23
24
|
await gramCtx.answerCallbackQuery("Model no longer available");
|
|
24
25
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-callback.js","sourceRoot":"","sources":["../../../src/bot/commands/model-callback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"model-callback.js","sourceRoot":"","sources":["../../../src/bot/commands/model-callback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAG7E,SAAS,UAAU,CAAC,IAAY;IAC9B,OAAO,IAAI;SACR,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,UAA0B;IAE1B,OAAO,KAAK,EAAE,OAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;QAEtC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,MAAM,OAAO,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,CAAC;YACjE,MAAM,OAAO,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,kBAAkB,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC1E,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAC3E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CACV,EAAE,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAC3D,8BAA8B,CAC/B,CAAC;YACF,MAAM,OAAO,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,MAAM,OAAO,CAAC,mBAAmB,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;QAClE,MAAM,OAAO,CAAC,eAAe,CAC3B,0BAA0B,UAAU,CAAC,OAAO,CAAC,8CAA8C,EAC3F,EAAE,UAAU,EAAE,MAAM,EAAE,CACvB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/bot/commands/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/bot/commands/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AASrD,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,cAAc,GACzB,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAiHjC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { InlineKeyboard } from "grammy";
|
|
2
2
|
import { updateProjectModel } from "../../config-writer.js";
|
|
3
|
+
import { getEffectiveProviderModels } from "../../engine/opencode-models.js";
|
|
3
4
|
function escapeHtml(text) {
|
|
4
5
|
return text
|
|
5
6
|
.replace(/&/g, "&")
|
|
@@ -9,7 +10,7 @@ function escapeHtml(text) {
|
|
|
9
10
|
export function createModelHandler(projectCtx) {
|
|
10
11
|
return async (gramCtx) => {
|
|
11
12
|
const { config, logger } = projectCtx;
|
|
12
|
-
const models = config
|
|
13
|
+
const models = getEffectiveProviderModels(config);
|
|
13
14
|
const messageText = gramCtx.message?.text ?? "";
|
|
14
15
|
const directMatch = messageText.match(/^\/model(?:@\w+)?\s+(.+)$/i);
|
|
15
16
|
const directModel = directMatch?.[1]?.trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/bot/commands/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/bot/commands/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { Context, NextFunction } from "grammy";
|
|
2
|
+
import type { ProjectContext } from "../../types.js";
|
|
3
|
+
export declare function createTasksHandler(ctx: ProjectContext): (gramCtx: Context) => Promise<void>;
|
|
4
|
+
export declare function createTasksCallbackHandler(ctx: ProjectContext): (gramCtx: Context, next: NextFunction) => Promise<void>;
|
|
5
|
+
//# sourceMappingURL=tasks.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../src/bot/commands/tasks.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AA8FrD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,cAAc,IACtC,SAAS,OAAO,KAAG,OAAO,CAAC,IAAI,CAAC,CAiC/C;AAWD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,cAAc,IAC9C,SAAS,OAAO,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CA0BnE"}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import { readFile } from "node:fs/promises";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { InlineKeyboard } from "grammy";
|
|
4
|
+
const CB = "tasks:";
|
|
5
|
+
// ─── Parsing ─────────────────────────────────────────────────────────────────
|
|
6
|
+
const SECTION_HEADERS = {
|
|
7
|
+
"## in progress": "inProgress",
|
|
8
|
+
"## ready tasks": "ready",
|
|
9
|
+
"## drafts": "drafts",
|
|
10
|
+
"## completed": "completed",
|
|
11
|
+
};
|
|
12
|
+
// Matches: - [022 — Title](path) or - [032a — Title](path)
|
|
13
|
+
// Also handles sub-tasks indented with spaces.
|
|
14
|
+
const TASK_RE = /^\s*-\s+\[(\d+[a-z]*)\s*[—–-]\s*([^\]]+)\]/i;
|
|
15
|
+
function parseItems(lines) {
|
|
16
|
+
return lines.flatMap((line) => {
|
|
17
|
+
const m = line.match(TASK_RE);
|
|
18
|
+
return m ? [{ id: m[1].trim(), name: m[2].trim() }] : [];
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
async function parseBacklog(cwd) {
|
|
22
|
+
const path = join(cwd, "tasks", "BACKLOG.md");
|
|
23
|
+
let content;
|
|
24
|
+
try {
|
|
25
|
+
content = await readFile(path, "utf-8");
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return { inProgress: [], ready: [], drafts: [], completed: [] };
|
|
29
|
+
}
|
|
30
|
+
const buckets = {
|
|
31
|
+
inProgress: [],
|
|
32
|
+
ready: [],
|
|
33
|
+
drafts: [],
|
|
34
|
+
completed: [],
|
|
35
|
+
};
|
|
36
|
+
let current = null;
|
|
37
|
+
for (const line of content.split("\n")) {
|
|
38
|
+
const lower = line.toLowerCase().trim();
|
|
39
|
+
const matched = SECTION_HEADERS[lower];
|
|
40
|
+
if (matched !== undefined) {
|
|
41
|
+
current = matched;
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
// Any unrecognised ## heading closes the current section
|
|
45
|
+
if (line.startsWith("## ")) {
|
|
46
|
+
current = null;
|
|
47
|
+
continue;
|
|
48
|
+
}
|
|
49
|
+
if (current !== null) {
|
|
50
|
+
buckets[current].push(line);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return {
|
|
54
|
+
inProgress: parseItems(buckets.inProgress),
|
|
55
|
+
ready: parseItems(buckets.ready),
|
|
56
|
+
drafts: parseItems(buckets.drafts),
|
|
57
|
+
completed: parseItems(buckets.completed),
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
// ─── Formatting ──────────────────────────────────────────────────────────────
|
|
61
|
+
function esc(text) {
|
|
62
|
+
return text.replace(/[_*`[]/g, "\\$&");
|
|
63
|
+
}
|
|
64
|
+
function formatList(tasks) {
|
|
65
|
+
return tasks.map((t) => `• *${t.id}* — ${esc(t.name)}`).join("\n");
|
|
66
|
+
}
|
|
67
|
+
// ─── Command handler ─────────────────────────────────────────────────────────
|
|
68
|
+
export function createTasksHandler(ctx) {
|
|
69
|
+
return async (gramCtx) => {
|
|
70
|
+
const { config } = ctx;
|
|
71
|
+
const bl = await parseBacklog(config.cwd);
|
|
72
|
+
const inProgressText = bl.inProgress.length > 0 ? formatList(bl.inProgress) : "_None_";
|
|
73
|
+
const readySlice = bl.ready.slice(0, 3);
|
|
74
|
+
const readySuffix = bl.ready.length > 3 ? `\n_…and ${bl.ready.length - 3} more_` : "";
|
|
75
|
+
const readyText = readySlice.length > 0 ? formatList(readySlice) + readySuffix : "_None_";
|
|
76
|
+
const summary = [
|
|
77
|
+
`*In Progress* (${bl.inProgress.length})`,
|
|
78
|
+
inProgressText,
|
|
79
|
+
"",
|
|
80
|
+
`*Ready* (${bl.ready.length}${bl.ready.length > 3 ? `, first 3` : ""})`,
|
|
81
|
+
readyText,
|
|
82
|
+
].join("\n");
|
|
83
|
+
const keyboard = new InlineKeyboard()
|
|
84
|
+
.text(`📝 Drafts (${bl.drafts.length})`, `${CB}drafts`)
|
|
85
|
+
.text(`✅ Ready (${bl.ready.length})`, `${CB}ready`)
|
|
86
|
+
.row()
|
|
87
|
+
.text(`🔄 In Progress (${bl.inProgress.length})`, `${CB}inprogress`)
|
|
88
|
+
.text(`🏁 Completed (${bl.completed.length})`, `${CB}completed`);
|
|
89
|
+
await gramCtx.reply(summary, {
|
|
90
|
+
parse_mode: "Markdown",
|
|
91
|
+
reply_markup: keyboard,
|
|
92
|
+
});
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
// ─── Callback handler ────────────────────────────────────────────────────────
|
|
96
|
+
const SECTION_META = {
|
|
97
|
+
drafts: { label: "📝 Drafts", key: "drafts" },
|
|
98
|
+
ready: { label: "✅ Ready", key: "ready" },
|
|
99
|
+
inprogress: { label: "🔄 In Progress", key: "inProgress" },
|
|
100
|
+
completed: { label: "🏁 Completed", key: "completed" },
|
|
101
|
+
};
|
|
102
|
+
export function createTasksCallbackHandler(ctx) {
|
|
103
|
+
return async (gramCtx, next) => {
|
|
104
|
+
const data = gramCtx.callbackQuery?.data;
|
|
105
|
+
if (!data?.startsWith(CB)) {
|
|
106
|
+
return next();
|
|
107
|
+
}
|
|
108
|
+
const { config } = ctx;
|
|
109
|
+
const slug = data.slice(CB.length);
|
|
110
|
+
const meta = SECTION_META[slug];
|
|
111
|
+
if (!meta) {
|
|
112
|
+
await gramCtx.answerCallbackQuery({ text: "Unknown section." });
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
const bl = await parseBacklog(config.cwd);
|
|
116
|
+
const tasks = bl[meta.key];
|
|
117
|
+
const body = tasks.length > 0 ? formatList(tasks) : "_No tasks in this section\\._";
|
|
118
|
+
const text = `*${meta.label}* (${tasks.length})\n\n${body}`;
|
|
119
|
+
await gramCtx.answerCallbackQuery();
|
|
120
|
+
await gramCtx.reply(text, { parse_mode: "Markdown" });
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=tasks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/bot/commands/tasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { createDocumentHandler } from "./document.js";
|
|
2
|
+
export { createMjsCallbackDispatcher } from "./mjs-callback.js";
|
|
2
3
|
export { createPhotoHandler } from "./photo.js";
|
|
3
4
|
export { createTextHandler } from "./text.js";
|
|
4
5
|
export { createVoiceHandler } from "./voice.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bot/handlers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bot/handlers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { createDocumentHandler } from "./document.js";
|
|
2
|
+
export { createMjsCallbackDispatcher } from "./mjs-callback.js";
|
|
2
3
|
export { createPhotoHandler } from "./photo.js";
|
|
3
4
|
export { createTextHandler } from "./text.js";
|
|
4
5
|
export { createVoiceHandler } from "./voice.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bot/handlers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bot/handlers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { Context, NextFunction } from "grammy";
|
|
2
|
+
import type { ProjectContext } from "../../types.js";
|
|
3
|
+
/**
|
|
4
|
+
* Generic callback query dispatcher for .mjs command files.
|
|
5
|
+
*
|
|
6
|
+
* When a callback_query data value is prefixed with a command name followed
|
|
7
|
+
* by ":" (e.g. "tasks:drafts"), this handler looks up the corresponding
|
|
8
|
+
* .hal/commands/{name}.mjs file and calls its `callbackHandler` export (if
|
|
9
|
+
* present), passing { data, gram, projectCtx }.
|
|
10
|
+
*
|
|
11
|
+
* This lets any .mjs command handle its own inline keyboard callbacks without
|
|
12
|
+
* requiring changes to bot.ts.
|
|
13
|
+
*/
|
|
14
|
+
export declare function createMjsCallbackDispatcher(ctx: ProjectContext): (gramCtx: Context, next: NextFunction) => Promise<void>;
|
|
15
|
+
//# sourceMappingURL=mjs-callback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mjs-callback.d.ts","sourceRoot":"","sources":["../../../src/bot/handlers/mjs-callback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,cAAc,IAC/C,SAAS,OAAO,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CA+EnE"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import { resolveCommandPath } from "../commands/loader.js";
|
|
2
|
+
/**
|
|
3
|
+
* Generic callback query dispatcher for .mjs command files.
|
|
4
|
+
*
|
|
5
|
+
* When a callback_query data value is prefixed with a command name followed
|
|
6
|
+
* by ":" (e.g. "tasks:drafts"), this handler looks up the corresponding
|
|
7
|
+
* .hal/commands/{name}.mjs file and calls its `callbackHandler` export (if
|
|
8
|
+
* present), passing { data, gram, projectCtx }.
|
|
9
|
+
*
|
|
10
|
+
* This lets any .mjs command handle its own inline keyboard callbacks without
|
|
11
|
+
* requiring changes to bot.ts.
|
|
12
|
+
*/
|
|
13
|
+
export function createMjsCallbackDispatcher(ctx) {
|
|
14
|
+
return async (gramCtx, next) => {
|
|
15
|
+
const data = gramCtx.callbackQuery?.data;
|
|
16
|
+
if (!data)
|
|
17
|
+
return next();
|
|
18
|
+
const colonIdx = data.indexOf(":");
|
|
19
|
+
if (colonIdx === -1)
|
|
20
|
+
return next();
|
|
21
|
+
const commandName = data.slice(0, colonIdx);
|
|
22
|
+
const filePath = resolveCommandPath(commandName, ctx.config.cwd, ctx.config.configDir);
|
|
23
|
+
if (!filePath) {
|
|
24
|
+
ctx.logger.debug({ commandName, cwd: ctx.config.cwd, configDir: ctx.config.configDir }, "MJS callback: no command file for prefix, passing through");
|
|
25
|
+
try {
|
|
26
|
+
await gramCtx.answerCallbackQuery();
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
// ignore
|
|
30
|
+
}
|
|
31
|
+
return next();
|
|
32
|
+
}
|
|
33
|
+
// From here on we've matched the command — answer the query on any failure
|
|
34
|
+
// to prevent the Telegram button from staying in a pending/spinning state.
|
|
35
|
+
let mod;
|
|
36
|
+
try {
|
|
37
|
+
mod = await import(`${filePath}?t=${Date.now()}`);
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
ctx.logger.error({
|
|
41
|
+
commandName,
|
|
42
|
+
error: err instanceof Error ? err.message : String(err),
|
|
43
|
+
}, "MJS callback: failed to import command file");
|
|
44
|
+
try {
|
|
45
|
+
await gramCtx.answerCallbackQuery({ text: "Command unavailable." });
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
// ignore
|
|
49
|
+
}
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
if (typeof mod.callbackHandler !== "function") {
|
|
53
|
+
try {
|
|
54
|
+
await gramCtx.answerCallbackQuery({ text: "No callback handler." });
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
// ignore
|
|
58
|
+
}
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
try {
|
|
62
|
+
await mod.callbackHandler({
|
|
63
|
+
data,
|
|
64
|
+
gram: gramCtx,
|
|
65
|
+
projectCtx: ctx,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
catch (err) {
|
|
69
|
+
ctx.logger.error({
|
|
70
|
+
commandName,
|
|
71
|
+
data,
|
|
72
|
+
error: err instanceof Error ? err.message : String(err),
|
|
73
|
+
stack: err instanceof Error ? err.stack : undefined,
|
|
74
|
+
}, "MJS callback handler failed");
|
|
75
|
+
try {
|
|
76
|
+
await gramCtx.answerCallbackQuery({ text: "Operation failed." });
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
// ignore
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=mjs-callback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mjs-callback.js","sourceRoot":"","sources":["../../../src/bot/handlers/mjs-callback.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":"AAoCA,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,CAgK7E"}
|
package/dist/bot.js
CHANGED
|
@@ -11,7 +11,7 @@ import { clearAllPrompts } from "./bot/commands/resetPrompt.js";
|
|
|
11
11
|
import { createCleanHandler } from "./bot/commands/session.js";
|
|
12
12
|
import { createStartHandler } from "./bot/commands/start.js";
|
|
13
13
|
import { startCommandWatcher } from "./bot/commands/watcher.js";
|
|
14
|
-
import { createDocumentHandler, createPhotoHandler, createTextHandler, createVoiceHandler, } from "./bot/handlers/index.js";
|
|
14
|
+
import { createDocumentHandler, createMjsCallbackDispatcher, createPhotoHandler, createTextHandler, createVoiceHandler, } from "./bot/handlers/index.js";
|
|
15
15
|
import { createAuthMiddleware } from "./bot/middleware/auth.js";
|
|
16
16
|
import { createRateLimitMiddleware } from "./bot/middleware/rateLimit.js";
|
|
17
17
|
/**
|
|
@@ -58,6 +58,8 @@ export async function startBot(projectCtx) {
|
|
|
58
58
|
bot.command("engine", createEngineHandler(projectCtx));
|
|
59
59
|
bot.on("callback_query:data", createEngineCallbackHandler(projectCtx));
|
|
60
60
|
}
|
|
61
|
+
// Generic callback dispatcher for .mjs commands that export `callbackHandler`
|
|
62
|
+
bot.on("callback_query:data", createMjsCallbackDispatcher(projectCtx));
|
|
61
63
|
// Wire handlers
|
|
62
64
|
bot.on("message:text", createTextHandler(projectCtx));
|
|
63
65
|
bot.on("message:photo", createPhotoHandler(projectCtx));
|
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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"}
|