kimaki 1.2.0 → 1.3.0
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.d.ts +7 -3
- package/dist/bot.js +9 -3
- package/dist/bot.js.map +1 -1
- package/dist/cli/bot.js +10 -5
- package/dist/cli/bot.js.map +1 -1
- package/dist/cli-lock.e2e.test.js +3 -2
- package/dist/cli-lock.e2e.test.js.map +1 -1
- package/dist/commands/login-commands.d.ts +1 -1
- package/dist/commands/preference-commands.d.ts +1 -1
- package/dist/commands/worktree-commands.d.ts +1 -1
- package/dist/event-loop.d.ts +2 -1
- package/dist/event-loop.js +2 -2
- package/dist/event-loop.js.map +1 -1
- package/dist/hello-thread.e2e.test.js +31 -0
- package/dist/hello-thread.e2e.test.js.map +1 -1
- package/dist/ingress.js +11 -6
- package/dist/ingress.js.map +1 -1
- package/dist/lock-routes.d.ts +14 -14
- package/dist/main.d.ts +1 -0
- package/dist/main.js +2 -1
- package/dist/main.js.map +1 -1
- package/dist/plugin/index.js +42 -9
- package/dist/plugin/index.js.map +1 -1
- package/dist/prompt.d.ts +6 -6
- package/dist/scheduler.d.ts +1 -1
- package/dist/sessions.d.ts +10 -10
- package/dist/sessions.js +3 -3
- package/dist/sessions.js.map +1 -1
- package/dist/system-prompt.d.ts +14 -0
- package/dist/system-prompt.js +34 -0
- package/dist/system-prompt.js.map +1 -1
- package/dist/test/harness.d.ts +2 -1
- package/dist/test/harness.js +2 -1
- package/dist/test/harness.js.map +1 -1
- package/dist/test/replay.js +1 -0
- package/dist/test/replay.js.map +1 -1
- package/dist/thread-reducer.d.ts +3 -0
- package/dist/thread-reducer.fixtures.test.js +2 -2
- package/dist/thread-reducer.fixtures.test.js.map +1 -1
- package/dist/thread-reducer.js +32 -4
- package/dist/thread-reducer.js.map +1 -1
- package/dist/thread-reducer.test.js +31 -0
- package/dist/thread-reducer.test.js.map +1 -1
- package/dist/tunnel.d.ts +12 -0
- package/dist/tunnel.js +207 -0
- package/dist/tunnel.js.map +1 -0
- package/dist/tunnel.test.d.ts +1 -0
- package/dist/tunnel.test.js +38 -0
- package/dist/tunnel.test.js.map +1 -0
- package/package.json +5 -5
- package/skills/kimaki-tunnel/SKILL.md +14 -10
- package/src/bot.ts +14 -4
- package/src/cli/bot.ts +9 -5
- package/src/cli-lock.e2e.test.ts +3 -2
- package/src/event-loop.ts +4 -1
- package/src/hello-thread.e2e.test.ts +35 -0
- package/src/ingress.ts +9 -5
- package/src/main.ts +4 -1
- package/src/message-tool.e2e.test.ts +45 -0
- package/src/plugin/index.ts +42 -9
- package/src/sessions.ts +3 -2
- package/src/system-prompt.ts +38 -0
- package/src/test/harness.ts +3 -0
- package/src/test/replay.ts +1 -0
- package/src/thread-reducer.fixtures.test.ts +2 -2
- package/src/thread-reducer.test.ts +31 -0
- package/src/thread-reducer.ts +36 -4
- package/src/tunnel.test.ts +39 -0
- package/src/tunnel.ts +209 -0
package/dist/ingress.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Discord ingress (spec 4): gates every messageCreate, parses it into a Route
|
|
2
|
-
// and calls actions. Gates, in order:
|
|
3
|
-
// ownership (only channels mapped in this
|
|
2
|
+
// and calls actions. Gates, in order: webhooks and our own messages (except
|
|
3
|
+
// remote send envelopes), channel ownership (only channels mapped in this
|
|
4
|
+
// machine's SQLite), permission (other bots need the Kimaki role).
|
|
4
5
|
// Messages of one channel are handled in arrival order, after OpenCode is ready.
|
|
5
6
|
//
|
|
6
7
|
// Messages sent while the bot was offline are not fetched here: gateway-proxy
|
|
@@ -52,6 +53,9 @@ function memberCanUseKimaki(bot, member) {
|
|
|
52
53
|
const roleNames = member.roles.cache.map((role) => role.name.toLowerCase());
|
|
53
54
|
if (roleNames.includes('no-kimaki'))
|
|
54
55
|
return false;
|
|
56
|
+
// Other bots are opt-in: only the Kimaki role lets them in, never admin rights or --allow-all-users.
|
|
57
|
+
if (member.user.bot)
|
|
58
|
+
return roleNames.includes('kimaki');
|
|
55
59
|
if (bot.allowAllUsers)
|
|
56
60
|
return true;
|
|
57
61
|
if (member.guild.ownerId === member.id)
|
|
@@ -211,9 +215,7 @@ async function handleMessage(bot, message) {
|
|
|
211
215
|
});
|
|
212
216
|
return;
|
|
213
217
|
}
|
|
214
|
-
if (message.author.bot) {
|
|
215
|
-
if (message.author.id !== bot.discord.user?.id)
|
|
216
|
-
return;
|
|
218
|
+
if (message.author.id === bot.discord.user?.id) {
|
|
217
219
|
return handleRemoteEnvelope(bot, { message, channelId, threadId: thread?.id ?? null });
|
|
218
220
|
}
|
|
219
221
|
if (!(await authorCanUseKimaki(bot, message))) {
|
|
@@ -295,7 +297,10 @@ export function registerIngress(bot) {
|
|
|
295
297
|
chains.set(channelId, next);
|
|
296
298
|
}
|
|
297
299
|
bot.discord.on(Events.MessageCreate, (message) => {
|
|
298
|
-
|
|
300
|
+
// Webhooks have no member to check. Own messages only matter as remote send envelopes.
|
|
301
|
+
if (message.webhookId)
|
|
302
|
+
return;
|
|
303
|
+
if (message.author.id === bot.discord.user?.id && !message.embeds[0]?.footer?.text.startsWith(REMOTE_SEND_PREFIX))
|
|
299
304
|
return;
|
|
300
305
|
serialize(message.channelId, () => handleMessage(bot, message));
|
|
301
306
|
});
|
package/dist/ingress.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingress.js","sourceRoot":"","sources":["../src/ingress.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,0EAA0E;AAC1E,yEAAyE;AACzE,iFAAiF;AACjF,EAAE;AACF,8EAA8E;AAC9E,4EAA4E;AAC5E,6EAA6E;AAC7E,qEAAqE;AACrE,iEAAiE;AACjE,EAAE;AACF,2EAA2E;AAC3E,6EAA6E;AAE7E,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EACL,MAAM,EACN,WAAW,EACX,YAAY,EACZ,mBAAmB,GAIpB,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAEhC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAA6B,MAAM,UAAU,CAAA;AACjF,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAC/F,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAc,MAAM,aAAa,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,UAAU,EAAE,cAAc,EAAuB,MAAM,YAAY,CAAA;AAElH,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,CAAA;AAEtC,sEAAsE;AACtE,0EAA0E;AAC1E,oCAAoC;AACpC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAA+B,EAC/B,EAAE,KAAK,EAAE,MAAM,EAAoC;IAEnD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;IACtG,IAAI,MAAM,YAAY,KAAK,EAAE,CAAC;QAC5B,+EAA+E;QAC/E,MAAM,CAAC,IAAI,CAAC,qCAAqC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAA;QAClE,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,CAAC,CAAC,MAAM,YAAY,WAAW,CAAC;QAAE,OAAO,KAAK,CAAA;IAClD,OAAO,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AACxC,CAAC;AAED,oFAAoF;AACpF,0FAA0F;AAC1F,SAAS,kBAAkB,CAAC,GAAQ,EAAE,OAAsB;IAC1D,IAAI,OAAO,CAAC,MAAM,YAAY,WAAW;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;IAC1G,OAAO,YAAY,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;AAC/E,CAAC;AAED,SAAS,kBAAkB,CAAC,GAA+B,EAAE,MAAmB;IAC9E,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IAC3E,IAAI,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAA;IACjD,IAAI,GAAG,CAAC,aAAa;QAAE,OAAO,IAAI,CAAA;IAClC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,EAAE;QAAE,OAAO,IAAI,CAAA;IACnD,IAAI,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAAE,OAAO,IAAI,CAAA;IAC1E,IAAI,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,mBAAmB,CAAC,WAAW,CAAC;QAAE,OAAO,IAAI,CAAA;IACxE,OAAO,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AACrC,CAAC;AAED,6EAA6E;AAC7E,gFAAgF;AAChF,KAAK,UAAU,eAAe,CAAC,EAC7B,OAAO,EACP,SAAS,EACT,WAAW,GAKZ;IACC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACvC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,CAAA;IAC9D,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ;SAC9B,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;SACrC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACnE,IAAI,OAAO,YAAY,KAAK;QAAE,OAAO,OAAO,CAAA;IAC5C,MAAM,KAAK,GAAiB,EAAE,CAAA;IAC9B,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QAC5C,IAAI,KAAK,YAAY,KAAK;YAAE,OAAO,KAAK,CAAA;QACxC,kDAAkD;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC,CAAA;QAC/F,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ;aAC9B,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC;aACtB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QACzE,IAAI,OAAO,YAAY,KAAK;YAAE,OAAO,OAAO,CAAA;QAC5C,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAA;IACtE,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,eAAgB,SAAQ,MAAM,CAAC,iBAAiB,CAAC;IACrD,IAAI,EAAE,iBAAiB;IACvB,OAAO,EAAE,qCAAqC;CAC/C,CAAC;CAAG;AAEL,KAAK,UAAU,gBAAgB,CAAC,GAAW;IACzC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IAC5G,IAAI,QAAQ,YAAY,KAAK;QAAE,OAAO,QAAQ,CAAA;IAC9C,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,OAAO,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;IACvH,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;AACnG,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,GAAW;IACjC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5F,IAAI,QAAQ,YAAY,KAAK;QAAE,OAAO,QAAQ,CAAA;IAC9C,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,OAAO,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,GAAG,UAAU,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;IAC1F,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACpG,IAAI,IAAI,YAAY,KAAK;QAAE,OAAO,IAAI,CAAA;IACtC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC;AAED,SAAS,cAAc,CAAC,UAAsB;IAC5C,OAAO;QACL,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAA;AACH,CAAC;AAED,yEAAyE;AACzE,KAAK,UAAU,UAAU,CACvB,GAAQ,EACR,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAuF;IAElI,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC5C,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,KAAK,CAAA;IACxC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAClD,IAAI,MAAM,YAAY,KAAK;QAAE,OAAO,MAAM,CAAA;IAC1C,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;QAC9B,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,QAAQ,EAAE,GAAG,CAAC,qBAAqB;QACnC,KAAK;QACL,SAAS,EAAE,cAAc,CAAC,UAAU,CAAC;QACrC,SAAS;QACT,sDAAsD;QACtD,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC;QACzF,SAAS;KACV,CAAC,CAAA;IACF,IAAI,MAAM,YAAY,KAAK;QAAE,OAAO,MAAM,CAAA;IAC1C,MAAM,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,EAAE,OAAO,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACvG,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAA;AAClC,CAAC;AAED,4FAA4F;AAC5F,KAAK,UAAU,oBAAoB,CAAC,GAAQ,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAoE;IAC9I,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAA;IAC9C,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,kBAAkB,CAAC;QAAE,OAAM;IACnD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CACxB,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAY,EAAE,CAAC,EACjF,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACnE,CAAA;IACD,IAAI,OAAO,YAAY,KAAK;QAAE,OAAM;IACpC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;IAC3B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAM;IAC/C,IAAI,CAAC,CAAC,WAAW,IAAI,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QAAE,OAAM;IACrH,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAM;IACxH,MAAM,YAAY,GAAG,YAAY,IAAI,KAAK,IAAI,KAAK,CAAC,UAAU,KAAK,kBAAkB,CAAA;IACrF,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;IACzC,MAAM,gBAAgB,GAAG,YAAY,IAAI,KAAK,EAAE,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;IAC/F,mEAAmE;IACnE,MAAM,MAAM,GAAG,CAAC,YAAY;QAC1B,CAAC,CAAC,OAAO,CAAC,OAAO;QACjB,CAAC,CAAC,gBAAgB;YAChB,CAAC,CAAC,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC;YAC9C,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,kCAAkC,CAAC,EAAE,CAAC,CAAA;IAC7G,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAA;IACtD,MAAM,KAAK,GAAG,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IAC/G,MAAM,WAAW,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,gBAAgB,CAAC,CAAA;IAC7G,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAA;IACjG,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1I,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAC3F,MAAM,OAAO;SACV,KAAK,CAAC;QACL,OAAO,EAAE,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,MAAM,CAAC,QAAQ,GAAG;QACxF,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,oBAAoB,GAAG,KAAK,CAAC,SAAS,IAAI,MAAM,EAAE,EAAE,EAAE,CAAC;QACrF,eAAe,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;QAC9B,0DAA0D;QAC1D,KAAK,EAAE,YAAY,CAAC,qBAAqB;KAC1C,CAAC;SACD,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC,CAAA;AACzE,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,GAAQ,EAAE,OAAgB;IACrD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAA;IAClD,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAA;IACvD,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QAAE,OAAM;IAE5C,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAC/C,IAAI,OAAO,YAAY,KAAK;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzD,IAAI,CAAC,OAAO;QAAE,OAAM;IACpB,IAAI,OAAO,CAAC,YAAY,KAAK,OAAO,EAAE,CAAC;QACrC,gEAAgE;QAChE,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,IAAI,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAAE,OAAM;QACrF,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE;YAChC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;YACzB,SAAS;YACT,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;YACpE,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAA;QACF,OAAM;IACR,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE;YAAE,OAAM;QACtD,OAAO,oBAAoB,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,CAAA;IACxF,CAAC;IACD,IAAI,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,MAAM,CAAC,QAAQ,wBAAwB,CAAC,CAAA;QACvE,OAAM;IACR,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5E,IAAI,MAAM,IAAI,CAAC,SAAS;QAAE,OAAM;IAChC,MAAM,MAAM,GAAG,EAAE,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;IAC3E,MAAM,WAAW,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE;QACzC,MAAM,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACnD,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IAClH,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;IACrD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,iBAAiB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAC7F,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC;QAClC,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,KAAK,CAAC;KACtE,CAAC,CAAA;IACF,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,WAAW,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,SAAS,GAAG,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAA;IACjG,IAAI,SAAS,YAAY,KAAK;QAAE,OAAO,WAAW,CAAC,SAAS,CAAC,CAAA;IAC7D,MAAM,KAAK,GAAG,KAAK;QACjB,CAAC,CAAC,MAAM,UAAU,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACjG,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAgB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IACxH,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,WAAW,CAAC,KAAK,CAAC,CAAA;IACrD,IAAI,CAAC,KAAK;QAAE,OAAM;IAClB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAC1G,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC,EAAE,CAAA;IACpE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,GAAG,MAAM,SAAS,MAAM,CAAC,QAAQ,OAAO,MAAM,CAAC,CAAC,CAAC,UAAU,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,SAAS,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAA;IACrI,kDAAkD;IAClD,IAAI,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACpG,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAA;IAC5J,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,qEAAqE;QACrE,iDAAiD;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,OAAgB,EAAE,CAAA;QACzI,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE;YACtC,SAAS;YACT,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,KAAK,EAAE,KAAK;YACZ,MAAM;YACN,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC;YACzB,KAAK;SACN,CAAC,CAAA;QACF,IAAI,OAAO,YAAY,KAAK;YAAE,OAAO,WAAW,CAAC,OAAO,CAAC,CAAA;QACzD,OAAM;IACR,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;IAC3F,IAAI,MAAM,YAAY,KAAK;QAAE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAA;IACvD,IAAI,CAAC,MAAM;QAAE,OAAM;IACnB,MAAM,IAAI,GACR,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,iCAAiC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,8BAA8B,MAAM,CAAC,QAAQ,GAAG,CAAA;IAC/H,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;AACrI,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,eAAe,CAAC,GAAQ;IACtC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAyB,CAAA;IAE/C,SAAS,SAAS,CAAC,SAAiB,EAAE,IAAyB;QAC7D,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;QAC3D,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACpC,yEAAyE;YACzE,+DAA+D;YAC/D,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAA;YACtC,IAAI,KAAK,YAAY,KAAK;gBAAE,OAAO,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAA;YAC5F,MAAM,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAA;QAC7E,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAC7B,CAAC;IAED,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE;QAC/C,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;YAAE,OAAM;QACjG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACjE,CAAC,CAAC,CAAA;IACF,+DAA+D;IAC/D,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE;QAC/C,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YACtC,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;YACvF,IAAI,CAAC,IAAI;gBAAE,OAAM;YACjB,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;YACpG,IAAI,MAAM,YAAY,KAAK;gBAAE,MAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QAC3F,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,yEAAyE;IACzE,4DAA4D;IAC5D,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACrD,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG;YAAE,OAAM;QAC/B,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YACtC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;YAChF,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;gBAAE,OAAM;YACjG,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;gBAAE,OAAM;YACrF,mEAAmE;YACnE,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;YAC9H,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,MAAM,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;gBACzC,OAAM;YACR,CAAC;YACD,oEAAoE;YACpE,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;YACjF,IAAI,CAAC,IAAI;gBAAE,OAAM;YACjB,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;YACxF,IAAI,MAAM,YAAY,KAAK;gBAAE,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QACtF,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"ingress.js","sourceRoot":"","sources":["../src/ingress.ts"],"names":[],"mappings":"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"}
|
package/dist/lock-routes.d.ts
CHANGED
|
@@ -367,17 +367,17 @@ export declare const lockRoutes: {
|
|
|
367
367
|
input: z.ZodObject<{
|
|
368
368
|
id: z.ZodString;
|
|
369
369
|
operation: z.ZodPipe<z.ZodString, z.ZodEnum<{
|
|
370
|
-
remove: "remove";
|
|
371
370
|
label: "label";
|
|
371
|
+
remove: "remove";
|
|
372
372
|
activate: "activate";
|
|
373
373
|
}>>;
|
|
374
374
|
label: z.ZodOptional<z.ZodString>;
|
|
375
375
|
}, z.core.$strip>;
|
|
376
376
|
run: (bot: Bot, input: {
|
|
377
377
|
id: string;
|
|
378
|
-
operation: "
|
|
378
|
+
operation: "label" | "remove" | "activate";
|
|
379
379
|
label?: string | undefined;
|
|
380
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
380
|
+
}, signal: AbortSignal) => Promise<Error | import("./errors.ts").OpenCodeError | OpenCodeUnavailableError | {
|
|
381
381
|
message: string;
|
|
382
382
|
}>;
|
|
383
383
|
};
|
|
@@ -548,7 +548,7 @@ export declare const lockRoutes: {
|
|
|
548
548
|
targetBranch?: string | undefined;
|
|
549
549
|
channelId?: string | undefined;
|
|
550
550
|
directory?: string | undefined;
|
|
551
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
551
|
+
}, signal: AbortSignal) => Promise<Error | DbError | import("./errors.ts").OpenCodeError | OpenCodeUnavailableError | ConfigError | import("./worktrees.ts").GitError | {
|
|
552
552
|
targetBranch: string;
|
|
553
553
|
commitCount: number;
|
|
554
554
|
sha: string;
|
|
@@ -576,7 +576,7 @@ export declare const lockRoutes: {
|
|
|
576
576
|
targetBranch?: string | undefined;
|
|
577
577
|
channelId?: string | undefined;
|
|
578
578
|
directory?: string | undefined;
|
|
579
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
579
|
+
}, signal: AbortSignal) => Promise<Error | DbError | import("./errors.ts").OpenCodeError | OpenCodeUnavailableError | ConfigError | import("./worktrees.ts").GitError | {
|
|
580
580
|
targetBranch: string;
|
|
581
581
|
commitCount: number;
|
|
582
582
|
sha: string;
|
|
@@ -595,7 +595,7 @@ export declare const lockRoutes: {
|
|
|
595
595
|
run: (bot: Bot, input: {
|
|
596
596
|
sessionId: string;
|
|
597
597
|
channelId?: string | undefined;
|
|
598
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
598
|
+
}, signal: AbortSignal) => Promise<Error | DbError | import("./errors.ts").OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | {
|
|
599
599
|
title: string;
|
|
600
600
|
threadId: string;
|
|
601
601
|
sessionId: string;
|
|
@@ -614,7 +614,7 @@ export declare const lockRoutes: {
|
|
|
614
614
|
sessionId?: string | undefined;
|
|
615
615
|
threadId?: string | undefined;
|
|
616
616
|
directory?: string | undefined;
|
|
617
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
617
|
+
}, signal: AbortSignal) => Promise<Error | DbError | import("./errors.ts").OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | import("./worktrees.ts").GitError | {
|
|
618
618
|
directory: string;
|
|
619
619
|
requestedDirectory?: undefined;
|
|
620
620
|
} | {
|
|
@@ -635,7 +635,7 @@ export declare const lockRoutes: {
|
|
|
635
635
|
text: string;
|
|
636
636
|
sessionId?: string | undefined;
|
|
637
637
|
threadId?: string | undefined;
|
|
638
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
638
|
+
}, signal: AbortSignal) => Promise<Error | import("./errors.ts").OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | {
|
|
639
639
|
title: string;
|
|
640
640
|
}>;
|
|
641
641
|
};
|
|
@@ -650,7 +650,7 @@ export declare const lockRoutes: {
|
|
|
650
650
|
run: (bot: Bot, input: {
|
|
651
651
|
sessionId?: string | undefined;
|
|
652
652
|
threadId?: string | undefined;
|
|
653
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
653
|
+
}, signal: AbortSignal) => Promise<Error | DiscordError | OpenCodeUnavailableError | ConfigError | {
|
|
654
654
|
archived: boolean;
|
|
655
655
|
}>;
|
|
656
656
|
};
|
|
@@ -665,7 +665,7 @@ export declare const lockRoutes: {
|
|
|
665
665
|
run: (bot: Bot, input: {
|
|
666
666
|
sessionId?: string | undefined;
|
|
667
667
|
threadId?: string | undefined;
|
|
668
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
668
|
+
}, signal: AbortSignal) => Promise<Error | import("./errors.ts").OpenCodeError | OpenCodeUnavailableError | ConfigError | {
|
|
669
669
|
cleared: number;
|
|
670
670
|
}>;
|
|
671
671
|
};
|
|
@@ -684,7 +684,7 @@ export declare const lockRoutes: {
|
|
|
684
684
|
threadId?: string | undefined;
|
|
685
685
|
before?: string | undefined;
|
|
686
686
|
name?: string | undefined;
|
|
687
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
687
|
+
}, signal: AbortSignal) => Promise<Error | DbError | import("./errors.ts").OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | import("./worktrees.ts").GitError | {
|
|
688
688
|
threadId: string;
|
|
689
689
|
sessionId: string;
|
|
690
690
|
}>;
|
|
@@ -764,7 +764,7 @@ export declare const lockRoutes: {
|
|
|
764
764
|
run: (bot: Bot, input: {
|
|
765
765
|
sessionId?: string | undefined;
|
|
766
766
|
threadId?: string | undefined;
|
|
767
|
-
}, signal: AbortSignal) => Promise<Error | import("@opencode/client").SessionInboxInfo[] | OpenCodeUnavailableError |
|
|
767
|
+
}, signal: AbortSignal) => Promise<Error | import("./errors.ts").OpenCodeError | import("@opencode/client").SessionInboxInfo[] | OpenCodeUnavailableError | ConfigError>;
|
|
768
768
|
};
|
|
769
769
|
'queue.remove': {
|
|
770
770
|
handle: (bot: Bot, raw: unknown, signal: AbortSignal) => Promise<Error | {
|
|
@@ -779,7 +779,7 @@ export declare const lockRoutes: {
|
|
|
779
779
|
inboxId: string;
|
|
780
780
|
sessionId?: string | undefined;
|
|
781
781
|
threadId?: string | undefined;
|
|
782
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
782
|
+
}, signal: AbortSignal) => Promise<Error | import("./errors.ts").OpenCodeError | OpenCodeUnavailableError | ConfigError | {
|
|
783
783
|
removed: boolean;
|
|
784
784
|
}>;
|
|
785
785
|
};
|
|
@@ -794,7 +794,7 @@ export declare const lockRoutes: {
|
|
|
794
794
|
run: (bot: Bot, input: {
|
|
795
795
|
sessionId?: string | undefined;
|
|
796
796
|
threadId?: string | undefined;
|
|
797
|
-
}, signal: AbortSignal) => Promise<Error |
|
|
797
|
+
}, signal: AbortSignal) => Promise<Error | import("./errors.ts").OpenCodeError | OpenCodeUnavailableError | ConfigError | {
|
|
798
798
|
cleared: number;
|
|
799
799
|
}>;
|
|
800
800
|
};
|
package/dist/main.d.ts
CHANGED
package/dist/main.js
CHANGED
|
@@ -150,7 +150,7 @@ export async function startBot(options) {
|
|
|
150
150
|
logger.warn(`transcript of ${sessionId} not synced`, result);
|
|
151
151
|
});
|
|
152
152
|
};
|
|
153
|
-
const eventLoop = createEventLoop({ store, db, discord, effects, recorder, analytics: options.analytics, onRunEnded: voiceCalls.runEnded, onTranscriptDue });
|
|
153
|
+
const eventLoop = createEventLoop({ store, db, discord, effects, recorder, analytics: options.analytics, messageTool: options.messageTool ?? false, onRunEnded: voiceCalls.runEnded, onTranscriptDue });
|
|
154
154
|
const loaded = await eventLoop.load();
|
|
155
155
|
if (loaded instanceof Error)
|
|
156
156
|
return loaded;
|
|
@@ -192,6 +192,7 @@ export async function startBot(options) {
|
|
|
192
192
|
autoWorktrees: options.autoWorktrees ?? false,
|
|
193
193
|
allowAllUsers: options.allowAllUsers ?? false,
|
|
194
194
|
disabledSkills: options.disabledSkills ?? [],
|
|
195
|
+
messageTool: options.messageTool ?? false,
|
|
195
196
|
features: { withSleepLock: createSleepLock(), waitForPlugin: createPluginWait({ opencode }), agentUi, voiceCalls },
|
|
196
197
|
};
|
|
197
198
|
const scheduler = createScheduler({
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,yEAAyE;AACzE,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACxE,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAE,EAAE,EAAY,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAmB,MAAM,kBAAkB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAyB,MAAM,sBAAsB,CAAA;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAA;AACzE,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAyB,MAAM,iBAAiB,CAAA;AAEzE,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;AACnC,oEAAoE;AACpE,MAAM,qBAAqB,GAAG,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/plugin/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import path from 'node:path';
|
|
|
6
6
|
import { autostartBot } from "../autostart.js";
|
|
7
7
|
import { readBuiltinSkills } from "../builtin-skills.js";
|
|
8
8
|
import { fileEditTool, recordToolEdits } from "../file-edit-log.js";
|
|
9
|
-
import { turnContext } from "../system-prompt.js";
|
|
9
|
+
import { MESSAGE_MODE_INSTRUCTIONS, MESSAGE_TOOL, MESSAGE_TOOL_DESCRIPTION, MESSAGE_TOOL_INPUT, turnContext } from "../system-prompt.js";
|
|
10
10
|
const exec = promisify(execFile);
|
|
11
11
|
const decodeSkill = Schema.decodeUnknownSync(Skill.Info);
|
|
12
12
|
const BRANCH_PREFIX = '[current git branch is ';
|
|
@@ -26,6 +26,7 @@ export default Plugin.define({
|
|
|
26
26
|
}
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
|
+
// metadata.kimaki of the session, or of the thread's root for a subagent (`root: false`).
|
|
29
30
|
async function marker(sessionID) {
|
|
30
31
|
const session = await ctx.session.get({ sessionID }).catch(() => null);
|
|
31
32
|
const value = session?.metadata?.['kimaki'];
|
|
@@ -33,13 +34,26 @@ export default Plugin.define({
|
|
|
33
34
|
return null;
|
|
34
35
|
const current = new Map(Object.entries(value));
|
|
35
36
|
if (!session?.parentID)
|
|
36
|
-
return current;
|
|
37
|
+
return { fields: current, root: true };
|
|
37
38
|
const parent = await ctx.session.get({ sessionID: session.parentID }).catch(() => null);
|
|
38
39
|
const parentMarker = parent?.metadata?.['kimaki'];
|
|
39
|
-
if (parentMarker && typeof parentMarker === 'object' && !Array.isArray(parentMarker) && parentMarker['threadId'] === current.get('threadId'))
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
if (parentMarker && typeof parentMarker === 'object' && !Array.isArray(parentMarker) && parentMarker['threadId'] === current.get('threadId')) {
|
|
41
|
+
const root = await marker(session.parentID);
|
|
42
|
+
return root && { fields: root.fields, root: false };
|
|
43
|
+
}
|
|
44
|
+
return { fields: current, root: true };
|
|
42
45
|
}
|
|
46
|
+
// Registered for every session; the context hook removes it outside message mode.
|
|
47
|
+
await ctx.tool.transform((editor) => {
|
|
48
|
+
editor.add({
|
|
49
|
+
name: MESSAGE_TOOL,
|
|
50
|
+
description: MESSAGE_TOOL_DESCRIPTION,
|
|
51
|
+
input: MESSAGE_TOOL_INPUT,
|
|
52
|
+
options: { codemode: false },
|
|
53
|
+
// Discord renders the call input (thread-reducer.ts); the tool itself does nothing.
|
|
54
|
+
execute: async () => ({ content: 'Message sent to the user.' }),
|
|
55
|
+
});
|
|
56
|
+
});
|
|
43
57
|
// The git branch reaches the model as a synthetic message saved right before
|
|
44
58
|
// the user prompt, only when it changed. Text in event.system would change the
|
|
45
59
|
// cached prompt prefix on every branch switch. The prompt hook runs before
|
|
@@ -60,11 +74,30 @@ export default Plugin.define({
|
|
|
60
74
|
return;
|
|
61
75
|
await ctx.session.synthetic({ sessionID: event.sessionID, text, delivery: event.delivery, resume: false }).catch(() => undefined);
|
|
62
76
|
});
|
|
77
|
+
// send_message only for root sessions of a bot started with --message-tool.
|
|
78
|
+
// Every request kind that carries the tool list gets the same tools and system
|
|
79
|
+
// text, so the prompt cache keeps hitting and no other session ever sees the tool.
|
|
80
|
+
async function applyMessageMode(event) {
|
|
81
|
+
const info = await marker(event.sessionID);
|
|
82
|
+
const messageMode = info?.root === true && info.fields.get('messageTool') === true;
|
|
83
|
+
if (!messageMode)
|
|
84
|
+
delete event.tools[MESSAGE_TOOL];
|
|
85
|
+
else
|
|
86
|
+
event.system.push({ type: 'text', text: MESSAGE_MODE_INSTRUCTIONS });
|
|
87
|
+
return info;
|
|
88
|
+
}
|
|
89
|
+
await ctx.session.hook('compaction', async (event) => {
|
|
90
|
+
await applyMessageMode(event);
|
|
91
|
+
});
|
|
92
|
+
await ctx.session.hook('generate', async (event) => {
|
|
93
|
+
await applyMessageMode(event);
|
|
94
|
+
});
|
|
63
95
|
await ctx.session.hook('context', async (event) => {
|
|
64
96
|
// The only prompt change for every session, TUI included. The ID never
|
|
65
97
|
// changes in a session, so the cached prompt prefix stays stable.
|
|
66
98
|
event.system.push({ type: 'text', text: `OpenCode session ID: ${event.sessionID}` });
|
|
67
|
-
|
|
99
|
+
const info = await applyMessageMode(event);
|
|
100
|
+
if (!info)
|
|
68
101
|
return;
|
|
69
102
|
// The <discord-user> context of each prompt, built from its metadata, so the
|
|
70
103
|
// stored text stays clean for the TUI and other clients. Same metadata, same
|
|
@@ -98,8 +131,8 @@ export default Plugin.define({
|
|
|
98
131
|
if (event.tool !== 'shell' || !event.input || typeof event.input !== 'object' || Array.isArray(event.input))
|
|
99
132
|
return;
|
|
100
133
|
const info = await marker(event.sessionID);
|
|
101
|
-
const dataDir = info?.get('dataDir');
|
|
102
|
-
const lockPort = info?.get('lockPort');
|
|
134
|
+
const dataDir = info?.fields.get('dataDir');
|
|
135
|
+
const lockPort = info?.fields.get('lockPort');
|
|
103
136
|
if (typeof dataDir !== 'string' || typeof lockPort !== 'number')
|
|
104
137
|
return;
|
|
105
138
|
if (!('command' in event.input) || typeof event.input.command !== 'string')
|
|
@@ -111,7 +144,7 @@ export default Plugin.define({
|
|
|
111
144
|
await ctx.tool.hook('execute.after', async (event) => {
|
|
112
145
|
if (event.status !== 'completed' || !fileEditTool(event.tool))
|
|
113
146
|
return;
|
|
114
|
-
const dataDir = (await marker(event.sessionID))?.get('dataDir');
|
|
147
|
+
const dataDir = (await marker(event.sessionID))?.fields.get('dataDir');
|
|
115
148
|
if (typeof dataDir !== 'string')
|
|
116
149
|
return;
|
|
117
150
|
// Plugins stay silent: a failed append only loses one index entry.
|
package/dist/plugin/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"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"}
|
package/dist/prompt.d.ts
CHANGED
|
@@ -35,7 +35,7 @@ export declare function steer(bot: Bot, input: {
|
|
|
35
35
|
export declare function cancelQueuedPrompt(bot: Bot, { threadId, inboxID }: {
|
|
36
36
|
threadId: string;
|
|
37
37
|
inboxID: string;
|
|
38
|
-
}): Promise<
|
|
38
|
+
}): Promise<OpenCodeError | OpenCodeUnavailableError | undefined>;
|
|
39
39
|
export declare function clearQueue(bot: Bot, { threadId, position }: {
|
|
40
40
|
threadId: string;
|
|
41
41
|
position?: number | null;
|
|
@@ -44,14 +44,14 @@ export declare function clearQueue(bot: Bot, { threadId, position }: {
|
|
|
44
44
|
}>;
|
|
45
45
|
export declare function abort(bot: Bot, { threadId }: {
|
|
46
46
|
threadId: string;
|
|
47
|
-
}): Promise<
|
|
47
|
+
}): Promise<OpenCodeError | OpenCodeUnavailableError | {
|
|
48
48
|
cleared: number;
|
|
49
49
|
}>;
|
|
50
50
|
export declare function requeueEdited(bot: Bot, { message, inboxID, files }: {
|
|
51
51
|
message: Message;
|
|
52
52
|
inboxID: string;
|
|
53
53
|
files: readonly PromptFile[];
|
|
54
|
-
}): Promise<void |
|
|
54
|
+
}): Promise<void | OpenCodeError | OpenCodeUnavailableError>;
|
|
55
55
|
export declare function shell(bot: Bot, { threadId, sessionId, command }: {
|
|
56
56
|
threadId: string;
|
|
57
57
|
sessionId: string;
|
|
@@ -70,7 +70,7 @@ export declare function runInSession(bot: Bot, { sessionId, threadId, threadName
|
|
|
70
70
|
files: readonly PromptFile[];
|
|
71
71
|
echo?: string;
|
|
72
72
|
model?: ModelChoice | null;
|
|
73
|
-
}): Promise<void |
|
|
73
|
+
}): Promise<void | OpenCodeError | OpenCodeUnavailableError | ConfigError>;
|
|
74
74
|
export declare function dispatch(bot: Bot, { thread, route, author, messageId, files, echo, model, }: {
|
|
75
75
|
thread: ThreadChannel;
|
|
76
76
|
route: Route;
|
|
@@ -85,12 +85,12 @@ export declare function dispatch(bot: Bot, { thread, route, author, messageId, f
|
|
|
85
85
|
}>;
|
|
86
86
|
export declare function undo(bot: Bot, { threadId }: {
|
|
87
87
|
threadId: string;
|
|
88
|
-
}): Promise<
|
|
88
|
+
}): Promise<OpenCodeError | OpenCodeUnavailableError | {
|
|
89
89
|
reverted: boolean;
|
|
90
90
|
}>;
|
|
91
91
|
export declare function redo(bot: Bot, { threadId }: {
|
|
92
92
|
threadId: string;
|
|
93
|
-
}): Promise<
|
|
93
|
+
}): Promise<OpenCodeError | OpenCodeUnavailableError | {
|
|
94
94
|
restored: "nothing";
|
|
95
95
|
} | {
|
|
96
96
|
restored: "all";
|
package/dist/scheduler.d.ts
CHANGED
|
@@ -77,7 +77,7 @@ export declare function listTasks({ db, guildId, all }: {
|
|
|
77
77
|
export declare function createTask(bot: Bot, { send: input, options }: {
|
|
78
78
|
send: SendInput;
|
|
79
79
|
options: ScheduleOptions;
|
|
80
|
-
}): Promise<DbError |
|
|
80
|
+
}): Promise<DbError | DiscordError | ConfigError | {
|
|
81
81
|
routineId: number;
|
|
82
82
|
schedule: string;
|
|
83
83
|
nextRunAt: string;
|
package/dist/sessions.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export declare function btwPrompt({ text, parentSessionId, sourceThreadId, sessi
|
|
|
12
12
|
sessionId: string;
|
|
13
13
|
threadId: string;
|
|
14
14
|
}): string;
|
|
15
|
-
export declare function threadProject(bot: Bot, thread: ThreadChannel): Promise<
|
|
15
|
+
export declare function threadProject(bot: Bot, thread: ThreadChannel): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | {
|
|
16
16
|
channelId: string;
|
|
17
17
|
projectDirectory: string;
|
|
18
18
|
directory: string;
|
|
@@ -20,19 +20,19 @@ export declare function threadProject(bot: Bot, thread: ThreadChannel): Promise<
|
|
|
20
20
|
export declare function sessionCwd(bot: Bot, { thread, directory }: {
|
|
21
21
|
thread: ThreadChannel;
|
|
22
22
|
directory?: string;
|
|
23
|
-
}): Promise<
|
|
23
|
+
}): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | import("./worktrees.ts").GitError | {
|
|
24
24
|
directory: string;
|
|
25
25
|
requestedDirectory?: undefined;
|
|
26
26
|
} | {
|
|
27
27
|
requestedDirectory: string;
|
|
28
28
|
directory?: undefined;
|
|
29
29
|
}>;
|
|
30
|
-
export declare function catalogReady(bot: Pick<Bot, 'opencode'>, directory: string): Promise<
|
|
31
|
-
export declare function primaryAgents(bot: Bot, directory: string): Promise<
|
|
30
|
+
export declare function catalogReady(bot: Pick<Bot, 'opencode'>, directory: string): Promise<OpenCodeError | OpenCodeUnavailableError | undefined>;
|
|
31
|
+
export declare function primaryAgents(bot: Bot, directory: string): Promise<OpenCodeError | OpenCodeUnavailableError | import("@opencode/client").AgentInfo[]>;
|
|
32
32
|
export declare function agentSelection(bot: Bot, { directory, agent }: {
|
|
33
33
|
directory: string;
|
|
34
34
|
agent: string;
|
|
35
|
-
}): Promise<
|
|
35
|
+
}): Promise<OpenCodeError | OpenCodeUnavailableError | ConfigError | {
|
|
36
36
|
agent: string;
|
|
37
37
|
model: ModelChoice | null;
|
|
38
38
|
}>;
|
|
@@ -41,7 +41,7 @@ export declare function switchAgent(bot: Bot, { sessionId, directory, agent, mod
|
|
|
41
41
|
directory: string;
|
|
42
42
|
agent: string;
|
|
43
43
|
model?: ModelChoice | null;
|
|
44
|
-
}): Promise<
|
|
44
|
+
}): Promise<OpenCodeError | OpenCodeUnavailableError | ConfigError | {
|
|
45
45
|
model: ModelChoice | null;
|
|
46
46
|
agent: string;
|
|
47
47
|
}>;
|
|
@@ -54,7 +54,7 @@ export declare function ensureSessionMarker(bot: Bot, { sessionId, thread, chann
|
|
|
54
54
|
directory: string;
|
|
55
55
|
userId: string;
|
|
56
56
|
}): Promise<ConfigError | OpenCodeUnavailableError | OpenCodeError | DiscordError | void>;
|
|
57
|
-
export declare function refreshCliContext(bot: Bot): Promise<
|
|
57
|
+
export declare function refreshCliContext(bot: Bot): Promise<OpenCodeError | OpenCodeUnavailableError | undefined>;
|
|
58
58
|
export declare function startSession(bot: Bot, { channelId, directory: requestedDirectory, route, author, messageId, startMessageId, showInput, threadName: explicitName, files, model: explicitModel, permissions, parentSessionId, task, worktree, baseBranch, run, }: {
|
|
59
59
|
channelId: string;
|
|
60
60
|
directory: string;
|
|
@@ -78,13 +78,13 @@ export declare function startSession(bot: Bot, { channelId, directory: requested
|
|
|
78
78
|
threadId: string;
|
|
79
79
|
sessionId: string;
|
|
80
80
|
}>;
|
|
81
|
-
export declare function channelForSession(bot: Bot, sessionId: string): Promise<string |
|
|
81
|
+
export declare function channelForSession(bot: Bot, sessionId: string): Promise<string | DbError | OpenCodeError | OpenCodeUnavailableError | ConfigError>;
|
|
82
82
|
export declare function channelForDirectory(bot: Bot, directory: string): Promise<string | DbError | ConfigError>;
|
|
83
83
|
export declare function resume(bot: Bot, { channelId, sessionId, author }: {
|
|
84
84
|
channelId: string;
|
|
85
85
|
sessionId: string;
|
|
86
86
|
author: Author;
|
|
87
|
-
}): Promise<
|
|
87
|
+
}): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | {
|
|
88
88
|
title: string;
|
|
89
89
|
threadId: string;
|
|
90
90
|
sessionId: string;
|
|
@@ -103,7 +103,7 @@ export declare function fork(bot: Bot, { sourceThread, sessionId, before, subage
|
|
|
103
103
|
name: string;
|
|
104
104
|
baseBranch?: string;
|
|
105
105
|
};
|
|
106
|
-
}): Promise<
|
|
106
|
+
}): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | import("./worktrees.ts").GitError | {
|
|
107
107
|
threadId: string;
|
|
108
108
|
sessionId: string;
|
|
109
109
|
}>;
|
package/dist/sessions.js
CHANGED
|
@@ -5,7 +5,7 @@ import path from 'node:path';
|
|
|
5
5
|
import crypto from 'node:crypto';
|
|
6
6
|
import { setTimeout as sleep } from 'node:timers/promises';
|
|
7
7
|
import * as orm from 'drizzle-orm';
|
|
8
|
-
import { cliContext, globalModel, oc, parseModel, projectOf, readMarker, rootSession, routeText, sessionDirectory, textChannel, } from "./bot.js";
|
|
8
|
+
import { cliContext, globalModel, markerIsCurrent, oc, parseModel, projectOf, readMarker, rootSession, routeText, sessionDirectory, textChannel, } from "./bot.js";
|
|
9
9
|
import { ConfigError, DbError, DiscordError, OpenCodeError, OpenCodeUnavailableError } from "./errors.js";
|
|
10
10
|
import { SILENT_MESSAGE_FLAGS } from "./format-parts.js";
|
|
11
11
|
import { createLogger } from "./logger.js";
|
|
@@ -210,7 +210,7 @@ export async function ensureSessionMarker(bot, { sessionId, thread, channelId, d
|
|
|
210
210
|
if (info instanceof Error)
|
|
211
211
|
return info;
|
|
212
212
|
const marker = readMarker(info.metadata);
|
|
213
|
-
if (marker &&
|
|
213
|
+
if (marker && markerIsCurrent(bot, marker))
|
|
214
214
|
return;
|
|
215
215
|
// Instructions first: the marker means "set up", so a failure here is retried on the next input.
|
|
216
216
|
if (!marker) {
|
|
@@ -243,7 +243,7 @@ export async function refreshCliContext(bot) {
|
|
|
243
243
|
const marker = readMarker(info.metadata);
|
|
244
244
|
if (!marker)
|
|
245
245
|
continue;
|
|
246
|
-
if (
|
|
246
|
+
if (markerIsCurrent(bot, marker))
|
|
247
247
|
continue;
|
|
248
248
|
const metadata = { ...info.metadata, kimaki: { ...marker.fields, ...cliContext(bot) } };
|
|
249
249
|
const result = await oc(bot, 'refresh Kimaki CLI context', (client) => client.session.update({ sessionID: sessionId, metadata }));
|