openryoko 2026.9.7 → 2026.9.16
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/package.json +3 -2
- package/dist/src/connectors/slack/goal-extractor.d.ts +4 -22
- package/dist/src/connectors/slack/goal-extractor.d.ts.map +1 -1
- package/dist/src/connectors/slack/goal-extractor.js +13 -25
- package/dist/src/connectors/slack/goal-extractor.js.map +1 -1
- package/dist/src/connectors/slack/index.d.ts +0 -4
- package/dist/src/connectors/slack/index.d.ts.map +1 -1
- package/dist/src/connectors/slack/index.js +1 -33
- package/dist/src/connectors/slack/index.js.map +1 -1
- package/dist/src/cron/command.d.ts +17 -0
- package/dist/src/cron/command.d.ts.map +1 -0
- package/dist/src/cron/command.js +177 -0
- package/dist/src/cron/command.js.map +1 -0
- package/dist/src/cron/runner.d.ts.map +1 -1
- package/dist/src/cron/runner.js +26 -0
- package/dist/src/cron/runner.js.map +1 -1
- package/dist/src/engines/codex.d.ts.map +1 -1
- package/dist/src/engines/codex.js +22 -3
- package/dist/src/engines/codex.js.map +1 -1
- package/dist/src/gateway/api.d.ts.map +1 -1
- package/dist/src/gateway/api.js +33 -11
- package/dist/src/gateway/api.js.map +1 -1
- package/dist/src/gateway/server.d.ts.map +1 -1
- package/dist/src/gateway/server.js +3 -5
- package/dist/src/gateway/server.js.map +1 -1
- package/dist/src/sessions/context.d.ts.map +1 -1
- package/dist/src/sessions/context.js +11 -2
- package/dist/src/sessions/context.js.map +1 -1
- package/dist/src/sessions/goal-execution.d.ts +16 -0
- package/dist/src/sessions/goal-execution.d.ts.map +1 -0
- package/dist/src/sessions/goal-execution.js +168 -0
- package/dist/src/sessions/goal-execution.js.map +1 -0
- package/dist/src/sessions/goal-review.d.ts +19 -0
- package/dist/src/sessions/goal-review.d.ts.map +1 -0
- package/dist/src/sessions/goal-review.js +51 -0
- package/dist/src/sessions/goal-review.js.map +1 -0
- package/dist/src/sessions/manager.d.ts +2 -1
- package/dist/src/sessions/manager.d.ts.map +1 -1
- package/dist/src/sessions/manager.js +20 -9
- package/dist/src/sessions/manager.js.map +1 -1
- package/dist/src/sessions/queue.d.ts +2 -0
- package/dist/src/sessions/queue.d.ts.map +1 -1
- package/dist/src/sessions/queue.js +5 -0
- package/dist/src/sessions/queue.js.map +1 -1
- package/dist/src/sessions/registry.d.ts +1 -0
- package/dist/src/sessions/registry.d.ts.map +1 -1
- package/dist/src/sessions/registry.js +6 -0
- package/dist/src/sessions/registry.js.map +1 -1
- package/dist/src/shared/effort.d.ts +1 -1
- package/dist/src/shared/effort.d.ts.map +1 -1
- package/dist/src/shared/effort.js +1 -1
- package/dist/src/shared/effort.js.map +1 -1
- package/dist/src/shared/oneShotCli.d.ts +2 -0
- package/dist/src/shared/oneShotCli.d.ts.map +1 -1
- package/dist/src/shared/oneShotCli.js +76 -48
- package/dist/src/shared/oneShotCli.js.map +1 -1
- package/dist/src/shared/rateLimit.d.ts.map +1 -1
- package/dist/src/shared/rateLimit.js +8 -0
- package/dist/src/shared/rateLimit.js.map +1 -1
- package/dist/src/shared/types.d.ts +30 -6
- package/dist/src/shared/types.d.ts.map +1 -1
- package/dist/src/shared/version.d.ts.map +1 -1
- package/dist/src/shared/version.js +33 -2
- package/dist/src/shared/version.js.map +1 -1
- package/dist/src/workflows/repository-mutex.d.ts +1 -1
- package/dist/web/404.html +1 -1
- package/dist/web/__next.__PAGE__.txt +10 -10
- package/dist/web/__next._full.txt +11 -11
- package/dist/web/__next._tree.txt +1 -1
- package/dist/web/_next/static/chunks/06f5vu6fx-0vs.js +22 -0
- package/dist/web/_next/static/chunks/0ep-6ef-rg6rg.js +1 -0
- package/dist/web/_next/static/chunks/0kjg7gf0lfmi2.js +1 -0
- package/dist/web/_next/static/chunks/{22x0rizn0r035.js → 0l7c4gjsopxt7.js} +1 -1
- package/dist/web/_next/static/chunks/{3vbt6hluyegkb.js → 0qh-c-8yl_h6w.js} +1 -1
- package/dist/web/_next/static/chunks/0x73a0kl7m-hz.js +1 -0
- package/dist/web/_next/static/chunks/{2x2o15573f7ff.js → 0xj6qm5u-rwef.js} +1 -1
- package/dist/web/_next/static/chunks/{2qfwwz46jhx3z.js → 0zg7t6v8hbgzx.js} +1 -1
- package/dist/web/_next/static/chunks/182bpiw90kpi8.js +1 -0
- package/dist/web/_next/static/chunks/19s8vn2kgy7q1.js +1 -0
- package/dist/web/_next/static/chunks/{2b11255zx-g25.js → 1omdg4m5w9lgx.js} +1 -1
- package/dist/web/_next/static/chunks/{318j2wz96k6gv.js → 221nas_jzikdi.js} +1 -1
- package/dist/web/_next/static/chunks/{2zfvh2r_pf47x.js → 25nob1new8t4s.js} +2 -2
- package/dist/web/_next/static/chunks/{389yahy212f1u.js → 2hsys2ea_7yoq.js} +1 -1
- package/dist/web/_next/static/chunks/{2xnz64yrge70p.js → 2htm5s8537a7h.js} +1 -1
- package/dist/web/_next/static/chunks/{2jwebp5qljded.js → 31-z4an7f1nwz.js} +1 -1
- package/dist/web/_next/static/chunks/{2q9pem30qccb2.js → 35b5d-5rn-wqs.js} +2 -2
- package/dist/web/_next/static/chunks/3_6klkygi417n.js +1 -0
- package/dist/web/_next/static/chunks/{0nsg_lm2gtp4v.js → 3m7i5huxbsh2d.js} +1 -1
- package/dist/web/_next/static/chunks/{1b-2_mk61vu6k.js → 3rmkr8ue0_15d.js} +1 -1
- package/dist/web/_next/static/chunks/turbopack-13laltw745x5k.js +1 -0
- package/dist/web/_not-found/__next._full.txt +9 -9
- package/dist/web/_not-found/__next._not-found.__PAGE__.txt +8 -8
- package/dist/web/_not-found/__next._tree.txt +1 -1
- package/dist/web/_not-found.html +1 -1
- package/dist/web/_not-found.txt +9 -9
- package/dist/web/chat/__next._full.txt +11 -11
- package/dist/web/chat/__next._tree.txt +1 -1
- package/dist/web/chat/__next.chat.__PAGE__.txt +10 -10
- package/dist/web/chat.html +1 -1
- package/dist/web/chat.txt +11 -11
- package/dist/web/cron/__next._full.txt +11 -11
- package/dist/web/cron/__next._tree.txt +1 -1
- package/dist/web/cron/__next.cron.__PAGE__.txt +10 -10
- package/dist/web/cron.html +1 -1
- package/dist/web/cron.txt +11 -11
- package/dist/web/index.html +1 -1
- package/dist/web/index.txt +11 -11
- package/dist/web/kanban/__next._full.txt +11 -11
- package/dist/web/kanban/__next._tree.txt +1 -1
- package/dist/web/kanban/__next.kanban.__PAGE__.txt +10 -10
- package/dist/web/kanban.html +1 -1
- package/dist/web/kanban.txt +11 -11
- package/dist/web/logs/__next._full.txt +11 -11
- package/dist/web/logs/__next._tree.txt +1 -1
- package/dist/web/logs/__next.logs.__PAGE__.txt +10 -10
- package/dist/web/logs.html +1 -1
- package/dist/web/logs.txt +11 -11
- package/dist/web/org/__next._full.txt +11 -11
- package/dist/web/org/__next._tree.txt +1 -1
- package/dist/web/org/__next.org.__PAGE__.txt +10 -10
- package/dist/web/org.html +1 -1
- package/dist/web/org.txt +11 -11
- package/dist/web/sessions/__next._full.txt +9 -9
- package/dist/web/sessions/__next._tree.txt +1 -1
- package/dist/web/sessions/__next.sessions.__PAGE__.txt +8 -8
- package/dist/web/sessions.html +1 -1
- package/dist/web/sessions.txt +9 -9
- package/dist/web/settings/__next._full.txt +11 -11
- package/dist/web/settings/__next._tree.txt +1 -1
- package/dist/web/settings/__next.settings.__PAGE__.txt +10 -10
- package/dist/web/settings.html +1 -1
- package/dist/web/settings.txt +11 -11
- package/dist/web/skills/__next._full.txt +11 -11
- package/dist/web/skills/__next._tree.txt +1 -1
- package/dist/web/skills/__next.skills.__PAGE__.txt +10 -10
- package/dist/web/skills.html +1 -1
- package/dist/web/skills.txt +11 -11
- package/package.json +3 -2
- package/template/AGENTS.md +1 -0
- package/template/CLAUDE.md +1 -0
- package/template/docs/cron-commands.md +52 -0
- package/template/docs/cron.md +8 -3
- package/template/migrations/2026.9.11/MIGRATION.md +11 -0
- package/template/migrations/2026.9.11/files/docs/cron-commands.md +52 -0
- package/template/skills/cron-manager/SKILL.md +79 -109
- package/dist/web/_next/static/chunks/0y7lqjb424p1t.js +0 -1
- package/dist/web/_next/static/chunks/22f08folyoc08.js +0 -1
- package/dist/web/_next/static/chunks/2wls4ydi12ltj.js +0 -1
- package/dist/web/_next/static/chunks/2zl5_vtgxjbs1.js +0 -1
- package/dist/web/_next/static/chunks/3_camp0zzjuc-.js +0 -1
- package/dist/web/_next/static/chunks/3m14pwz5rz7tl.js +0 -22
- package/dist/web/_next/static/chunks/3tddjc7ntk5ue.js +0 -1
- package/dist/web/_next/static/chunks/turbopack-0my_el9wn34di.js +0 -1
- /package/dist/web/_next/static/{HnwmeyhmD5toTGOXuWDah → R70RnwZx9YORkVC57qLt0}/_buildManifest.js +0 -0
- /package/dist/web/_next/static/{HnwmeyhmD5toTGOXuWDah → R70RnwZx9YORkVC57qLt0}/_clientMiddlewareManifest.js +0 -0
- /package/dist/web/_next/static/{HnwmeyhmD5toTGOXuWDah → R70RnwZx9YORkVC57qLt0}/_ssgManifest.js +0 -0
package/dist/src/cron/runner.js
CHANGED
|
@@ -4,12 +4,37 @@ import { scanOrg, findEmployee } from "../gateway/org.js";
|
|
|
4
4
|
import { CronConnector } from "../connectors/cron/index.js";
|
|
5
5
|
import { buildUpdateNotificationPrompt, checkForUpdates } from "../updates/checker.js";
|
|
6
6
|
import { getLastNotifiedVersion, markVersionNotified } from "../updates/notification-state.js";
|
|
7
|
+
import { runCommand } from "./command.js";
|
|
7
8
|
const updateNotificationRuns = new Set();
|
|
8
9
|
export async function runCronJob(job, sessionManager, config, connectors) {
|
|
9
10
|
const startTime = Date.now();
|
|
10
11
|
logger.info(`Cron job "${job.name}" (${job.id}) starting`);
|
|
11
12
|
const delivery = job.delivery || config.cron?.defaultDelivery;
|
|
12
13
|
const startedAt = new Date().toISOString();
|
|
14
|
+
if (job.kind === "command") {
|
|
15
|
+
let result;
|
|
16
|
+
try {
|
|
17
|
+
result = await runCommand(job);
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
result = { status: "error", error: error instanceof Error ? error.message : String(error) };
|
|
21
|
+
}
|
|
22
|
+
appendRunLog(job.id, { timestamp: startedAt, kind: "command", durationMs: Date.now() - startTime, ...result });
|
|
23
|
+
logger.info(`Cron command "${job.name}" ${result.status} in ${Date.now() - startTime}ms`);
|
|
24
|
+
if (result.status === "error") {
|
|
25
|
+
const target = job.failureDelivery === null ? undefined : job.failureDelivery ?? (config.cron?.alertConnector && config.cron?.alertChannel
|
|
26
|
+
? { connector: config.cron.alertConnector, channel: config.cron.alertChannel } : undefined);
|
|
27
|
+
if (target) {
|
|
28
|
+
const connector = connectors.get(target.connector);
|
|
29
|
+
if (connector)
|
|
30
|
+
await connector.sendMessage({ channel: target.channel }, `⚠️ Cron job "${job.name}" failed: ${result.error ?? "Command failed"}`)
|
|
31
|
+
.catch(error => logger.error(`Cron command alert failed: ${String(error)}`));
|
|
32
|
+
else
|
|
33
|
+
logger.error(`Cron command alert connector unavailable: ${target.connector}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
13
38
|
if (job.kind === "update-notification") {
|
|
14
39
|
if (updateNotificationRuns.has(job.id)) {
|
|
15
40
|
appendRunLog(job.id, {
|
|
@@ -128,6 +153,7 @@ export async function runCronJob(job, sessionManager, config, connectors) {
|
|
|
128
153
|
engine: job.engine || employee?.engine || config.engines.default,
|
|
129
154
|
model: job.model || employee?.model || config.engines[(job.engine || config.engines.default)]?.model,
|
|
130
155
|
title: job.name,
|
|
156
|
+
effortLevel: job.effortLevel,
|
|
131
157
|
});
|
|
132
158
|
if (updateVersion && (connector.getDeliveredMessageCount() === 0 ||
|
|
133
159
|
!connector.hasDeliveredTextContaining(updateVersion))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/cron/runner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,EAAE,6BAA6B,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/cron/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/engines/codex.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAsBxG,qBAAa,WAAY,YAAW,mBAAmB;IACrD,IAAI,EAAG,OAAO,CAAU;IACxB,OAAO,CAAC,aAAa,CAAkC;IAEvD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,SAAgB,GAAG,IAAI;IAcrD,OAAO,IAAI,IAAI;IAMf,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAK7B,GAAG,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAyLrD,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/engines/codex.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAsBxG,qBAAa,WAAY,YAAW,mBAAmB;IACrD,IAAI,EAAG,OAAO,CAAU;IACxB,OAAO,CAAC,aAAa,CAAkC;IAEvD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,SAAgB,GAAG,IAAI;IAcrD,OAAO,IAAI,IAAI;IAMf,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAK7B,GAAG,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAyLrD,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,gBAAgB;IAkKxB,OAAO,CAAC,aAAa;CAYtB"}
|
|
@@ -182,7 +182,7 @@ export class CodexEngine {
|
|
|
182
182
|
});
|
|
183
183
|
return;
|
|
184
184
|
}
|
|
185
|
-
if (code === 0
|
|
185
|
+
if (code === 0) {
|
|
186
186
|
resolve({
|
|
187
187
|
sessionId: threadId || opts.resumeSessionId || "",
|
|
188
188
|
result: resultText,
|
|
@@ -252,6 +252,21 @@ export class CodexEngine {
|
|
|
252
252
|
return null;
|
|
253
253
|
}
|
|
254
254
|
const eventType = String(msg.type || "");
|
|
255
|
+
if (eventType === "item.started" || eventType === "item.completed") {
|
|
256
|
+
const item = msg.item;
|
|
257
|
+
if (item?.type === "mcp_tool_call") {
|
|
258
|
+
const completed = eventType === "item.completed";
|
|
259
|
+
return { type: completed ? "tool_end" : "tool_start", delta: {
|
|
260
|
+
type: completed ? "tool_result" : "tool_use", toolId: String(item.id ?? ""),
|
|
261
|
+
toolName: `${item.server ?? "mcp"}/${item.tool ?? "tool"}`,
|
|
262
|
+
content: JSON.stringify(completed ? { status: item.status, result: item.result, error: item.error } : item.arguments ?? null).slice(0, 8000),
|
|
263
|
+
} };
|
|
264
|
+
}
|
|
265
|
+
if (item?.type === "file_change" && eventType === "item.completed") {
|
|
266
|
+
return { type: "tool_end", delta: { type: "tool_result", toolId: String(item.id ?? ""), toolName: "file_change",
|
|
267
|
+
content: JSON.stringify({ status: item.status, changes: item.changes }).slice(0, 8000) } };
|
|
268
|
+
}
|
|
269
|
+
}
|
|
255
270
|
if (eventType === "thread.started") {
|
|
256
271
|
return { type: "thread_id", threadId: String(msg.thread_id || "") };
|
|
257
272
|
}
|
|
@@ -318,8 +333,10 @@ export class CodexEngine {
|
|
|
318
333
|
delta: {
|
|
319
334
|
type: "tool_result",
|
|
320
335
|
content: output
|
|
321
|
-
? `${command} (exit ${exitCode}): ${output.slice(
|
|
336
|
+
? `${command} (exit ${exitCode}): ${output.slice(-8000)}`
|
|
322
337
|
: `${command} (exit ${exitCode})`,
|
|
338
|
+
toolName: "command_execution",
|
|
339
|
+
toolId: String(item.id || ""),
|
|
323
340
|
},
|
|
324
341
|
};
|
|
325
342
|
}
|
|
@@ -333,7 +350,9 @@ export class CodexEngine {
|
|
|
333
350
|
}
|
|
334
351
|
if (itemType === "error") {
|
|
335
352
|
const message = String(item.message || "Unknown error");
|
|
336
|
-
if (message.includes("Under-development features") ||
|
|
353
|
+
if (message.includes("Under-development features") ||
|
|
354
|
+
message.includes("Model metadata") ||
|
|
355
|
+
message.startsWith("Skill descriptions were shortened to fit the skills context budget.")) {
|
|
337
356
|
logger.debug(`[codex] suppressed warning: ${message.slice(0, 200)}`);
|
|
338
357
|
return null;
|
|
339
358
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/engines/codex.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/engines/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/gateway/api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/gateway/api.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,IAAI,WAAW,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAQhF,OAAO,KAAK,EAAoC,UAAU,EAAmB,MAAM,oBAAoB,CAAC;AAGxG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AA0E7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAgB/D,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,UAAU,CAAC;IAC5B,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,oBAAoB,EAAE,SAAS,CAAC,CAAC;IAChE,wBAAwB,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACrG;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAChG;;;;;;OAMG;IACH,2BAA2B,CAAC,EAAE,MAAM,IAAI,CAAC;IACzC;;;;OAIG;IACH,gCAAgC,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9C;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,oBAAoB,EAAE,YAAY,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gFAAgF;IAChF,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;8EAC0E;IAC1E,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,EAAE,QAAQ,CAAC;IACrD;qEACiE;IACjE,kBAAkB,CAAC,EAAE,OAAO,4BAA4B,EAAE,kBAAkB,CAAC;CAC9E;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CA4CpE;AA+MD;;+DAE+D;AAC/D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAa9D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqCnH;AA4CD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CA6gEf;AA0tBD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAIpE;AAiHD,kDAAkD;AAClD,wBAAgB,sBAAsB,IAAI,IAAI,CAG7C"}
|
package/dist/src/gateway/api.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { validateCommandJob } from "../cron/command.js";
|
|
2
|
+
import { validateCronSchedule } from "../cron/validation.js";
|
|
1
3
|
import http from "node:http";
|
|
2
4
|
import crypto from "node:crypto";
|
|
3
5
|
import fs from "node:fs";
|
|
@@ -6,6 +8,7 @@ import path from "node:path";
|
|
|
6
8
|
import yaml from "js-yaml";
|
|
7
9
|
import cron from "node-cron";
|
|
8
10
|
import { isInterruptibleEngine } from "../shared/types.js";
|
|
11
|
+
import { runWithSessionGoal, sessionGoalOptions } from "../sessions/goal-execution.js";
|
|
9
12
|
import { buildContext } from "../sessions/context.js";
|
|
10
13
|
import { initDb, listSessions, getSession, createSession, updateSession, deleteSession, deleteSessions, duplicateSession, insertMessage, getMessages, enqueueQueueItem, insertNotificationWithQueueItem, cancelQueueItem, getQueueItems, cancelAllPendingQueueItems, listAllPendingQueueItems, getFile, getMessagePage, getMessageWindow, isFtsBackfillPending, listSessionPage, searchMessages, } from "../sessions/registry.js";
|
|
11
14
|
import { forkEngineSession } from "../sessions/fork.js";
|
|
@@ -1274,7 +1277,10 @@ export async function handleApiRequest(req, res, context) {
|
|
|
1274
1277
|
name: body.name || "untitled",
|
|
1275
1278
|
enabled: body.enabled ?? true,
|
|
1276
1279
|
schedule: body.schedule || "0 * * * *",
|
|
1277
|
-
kind: body.kind
|
|
1280
|
+
kind: body.kind ?? "prompt",
|
|
1281
|
+
command: body.command,
|
|
1282
|
+
failureDelivery: body.failureDelivery,
|
|
1283
|
+
effortLevel: body.effortLevel,
|
|
1278
1284
|
timezone: body.timezone,
|
|
1279
1285
|
engine: body.engine,
|
|
1280
1286
|
model: body.model,
|
|
@@ -1282,6 +1288,13 @@ export async function handleApiRequest(req, res, context) {
|
|
|
1282
1288
|
prompt: body.prompt || "",
|
|
1283
1289
|
delivery: body.delivery,
|
|
1284
1290
|
};
|
|
1291
|
+
if (!["prompt", "update-notification", "command"].includes(newJob.kind))
|
|
1292
|
+
return badRequest(res, "Invalid cron job kind");
|
|
1293
|
+
if (newJob.kind === "command") {
|
|
1294
|
+
const error = validateCommandJob(newJob) ?? validateCronSchedule(newJob)[0]?.message;
|
|
1295
|
+
if (error)
|
|
1296
|
+
return badRequest(res, error);
|
|
1297
|
+
}
|
|
1285
1298
|
if (newJob.kind === "update-notification") {
|
|
1286
1299
|
if (!cron.validate(newJob.schedule))
|
|
1287
1300
|
return badRequest(res, "Invalid cron schedule");
|
|
@@ -1309,9 +1322,14 @@ export async function handleApiRequest(req, res, context) {
|
|
|
1309
1322
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1310
1323
|
const body = _parsed.body;
|
|
1311
1324
|
const updated = { ...jobs[idx], ...body, id: params.id };
|
|
1312
|
-
if (updated.kind !== undefined && updated.kind !== "prompt" && updated.kind !== "update-notification") {
|
|
1325
|
+
if (updated.kind !== undefined && updated.kind !== "prompt" && updated.kind !== "update-notification" && updated.kind !== "command") {
|
|
1313
1326
|
return badRequest(res, "Invalid cron job kind");
|
|
1314
1327
|
}
|
|
1328
|
+
if (updated.kind === "command") {
|
|
1329
|
+
const error = validateCommandJob(updated) ?? validateCronSchedule(updated)[0]?.message;
|
|
1330
|
+
if (error)
|
|
1331
|
+
return badRequest(res, error);
|
|
1332
|
+
}
|
|
1315
1333
|
if (updated.kind === "update-notification") {
|
|
1316
1334
|
if (!cron.validate(updated.schedule))
|
|
1317
1335
|
return badRequest(res, "Invalid cron schedule");
|
|
@@ -2539,6 +2557,10 @@ deliverToConnector) {
|
|
|
2539
2557
|
return;
|
|
2540
2558
|
}
|
|
2541
2559
|
logger.info(`Web session ${currentSession.id} running engine "${currentSession.engine}" (model: ${currentSession.model || "default"})`);
|
|
2560
|
+
const goalOptions = sessionGoalOptions(config, currentSession, context.sessionManager.getQueue(), prompt);
|
|
2561
|
+
// System wake-ups may resume a tracked task but are never a new user goal.
|
|
2562
|
+
if (deliverToConnector)
|
|
2563
|
+
goalOptions.extraction = { ...goalOptions.extraction, enabled: false };
|
|
2542
2564
|
// Ensure status is "running" (may already be set by the POST handler)
|
|
2543
2565
|
const currentStatus = getSession(currentSession.id);
|
|
2544
2566
|
if (currentStatus && currentStatus.status !== "running") {
|
|
@@ -2604,7 +2626,7 @@ deliverToConnector) {
|
|
|
2604
2626
|
return `We temporarily switched to GPT due to a Claude usage limit. Sync your context with this transcript (most recent last), then respond to the last USER message.\n\n${transcript}`;
|
|
2605
2627
|
})()
|
|
2606
2628
|
: prompt;
|
|
2607
|
-
const result = await engine
|
|
2629
|
+
const result = await runWithSessionGoal(engine, {
|
|
2608
2630
|
prompt: promptToRun,
|
|
2609
2631
|
resumeSessionId: currentSession.engineSessionId ?? undefined,
|
|
2610
2632
|
systemPrompt,
|
|
@@ -2640,7 +2662,7 @@ deliverToConnector) {
|
|
|
2640
2662
|
logger.warn(`Failed to emit stream delta for session ${currentSession.id}: ${err instanceof Error ? err.message : err}`);
|
|
2641
2663
|
}
|
|
2642
2664
|
},
|
|
2643
|
-
}).finally(() => {
|
|
2665
|
+
}, goalOptions).finally(() => {
|
|
2644
2666
|
clearInterval(runHeartbeat);
|
|
2645
2667
|
});
|
|
2646
2668
|
if (!getSession(currentSession.id)) {
|
|
@@ -2696,7 +2718,7 @@ deliverToConnector) {
|
|
|
2696
2718
|
const fallbackPrompt = codexResume
|
|
2697
2719
|
? prompt
|
|
2698
2720
|
: `Continue this conversation and respond to the last USER message.\n\nConversation so far:\n\n${historyText}`;
|
|
2699
|
-
const fallbackResult = await fallbackEngine
|
|
2721
|
+
const fallbackResult = await runWithSessionGoal(fallbackEngine, {
|
|
2700
2722
|
prompt: fallbackPrompt,
|
|
2701
2723
|
resumeSessionId: codexResume,
|
|
2702
2724
|
systemPrompt,
|
|
@@ -2718,7 +2740,7 @@ deliverToConnector) {
|
|
|
2718
2740
|
subAgent: delta.subAgent,
|
|
2719
2741
|
});
|
|
2720
2742
|
},
|
|
2721
|
-
});
|
|
2743
|
+
}, goalOptions);
|
|
2722
2744
|
recordTurnAccounting(currentSession.id, fallbackResult);
|
|
2723
2745
|
if (fallbackResult.result) {
|
|
2724
2746
|
insertMessage(currentSession.id, "assistant", fallbackResult.result);
|
|
@@ -2740,7 +2762,7 @@ deliverToConnector) {
|
|
|
2740
2762
|
});
|
|
2741
2763
|
if (completedFallback) {
|
|
2742
2764
|
notifyParentSession(completedFallback, { result: fallbackResult.result, error: fallbackResult.error ?? null, cost: fallbackResult.cost, durationMs: fallbackResult.durationMs }, { alwaysNotify: employee?.alwaysNotify });
|
|
2743
|
-
if (deliverToConnector && fallbackResult.result && !fallbackResult.error) {
|
|
2765
|
+
if (deliverToConnector && fallbackResult.result && (!fallbackResult.error || fallbackResult.retryable === false)) {
|
|
2744
2766
|
const delivery = await deliverToOriginConnector(completedFallback, fallbackResult.result, context.connectors);
|
|
2745
2767
|
if (isUndeliveredToOrigin(delivery, completedFallback))
|
|
2746
2768
|
recordFailedOriginDelivery(completedFallback, context.emit);
|
|
@@ -2805,7 +2827,7 @@ deliverToConnector) {
|
|
|
2805
2827
|
return;
|
|
2806
2828
|
}
|
|
2807
2829
|
logger.info(`Web session ${currentSession.id} retrying after usage limit (attempt ${attempt})`);
|
|
2808
|
-
const retryResult = await engine
|
|
2830
|
+
const retryResult = await runWithSessionGoal(engine, {
|
|
2809
2831
|
prompt,
|
|
2810
2832
|
resumeSessionId: current.engineSessionId ?? undefined,
|
|
2811
2833
|
systemPrompt,
|
|
@@ -2827,7 +2849,7 @@ deliverToConnector) {
|
|
|
2827
2849
|
subAgent: delta.subAgent,
|
|
2828
2850
|
});
|
|
2829
2851
|
},
|
|
2830
|
-
});
|
|
2852
|
+
}, goalOptions);
|
|
2831
2853
|
const retryInterrupted = retryResult.error?.startsWith("Interrupted");
|
|
2832
2854
|
const retryRateLimit = !retryInterrupted ? detectRateLimit(retryResult) : { limited: false };
|
|
2833
2855
|
if (retryRateLimit.limited) {
|
|
@@ -2861,7 +2883,7 @@ deliverToConnector) {
|
|
|
2861
2883
|
notifyRateLimitResumed(completedAfterRetry);
|
|
2862
2884
|
notifyDiscordChannel(`✅ Claude usage limit cleared. Session ${currentSession.id}${currentSession.employee ? ` (${currentSession.employee})` : ""} resumed.`);
|
|
2863
2885
|
notifyParentSession(completedAfterRetry, { result: retryResult.result, error: retryResult.error ?? null, cost: retryResult.cost, durationMs: retryResult.durationMs }, { alwaysNotify: employee?.alwaysNotify });
|
|
2864
|
-
if (deliverToConnector && retryResult.result && !retryResult.error) {
|
|
2886
|
+
if (deliverToConnector && retryResult.result && (!retryResult.error || retryResult.retryable === false)) {
|
|
2865
2887
|
const delivery = await deliverToOriginConnector(completedAfterRetry, retryResult.result, context.connectors);
|
|
2866
2888
|
if (isUndeliveredToOrigin(delivery, completedAfterRetry))
|
|
2867
2889
|
recordFailedOriginDelivery(completedAfterRetry, context.emit);
|
|
@@ -2934,7 +2956,7 @@ deliverToConnector) {
|
|
|
2934
2956
|
}
|
|
2935
2957
|
if (completedSession) {
|
|
2936
2958
|
notifyParentSession(completedSession, { result: result.result, error: result.error ?? null, cost: result.cost, durationMs: result.durationMs }, { alwaysNotify: employee?.alwaysNotify });
|
|
2937
|
-
if (deliverToConnector && result.result && !result.error) {
|
|
2959
|
+
if (deliverToConnector && result.result && (!result.error || result.retryable === false)) {
|
|
2938
2960
|
const delivery = await deliverToOriginConnector(completedSession, result.result, context.connectors);
|
|
2939
2961
|
if (isUndeliveredToOrigin(delivery, completedSession))
|
|
2940
2962
|
recordFailedOriginDelivery(completedSession, context.emit);
|