@openchamber/web 1.18.2 → 1.18.4
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/bin/lib/commands-models.js +1 -1
- package/dist/assets/{CodeMirrorCommentWidgets-CxcJ5x9h.js → CodeMirrorCommentWidgets-4qZbrEXU.js} +1 -1
- package/dist/assets/{CommitSection-C9sBBYAJ.js → CommitSection-MJmntVPJ.js} +1 -1
- package/dist/assets/{DiagramEditor-C7nUw7p3.js → DiagramEditor-jnG3Hbxg.js} +1 -1
- package/dist/assets/{DiagramView-cYxZP-HS.js → DiagramView-CFXxgg_a.js} +1 -1
- package/dist/assets/{DiffView-1zd0slLu.js → DiffView-DZIoOnV7.js} +2 -2
- package/dist/assets/FilesView-BKL6YlKG.js +14 -0
- package/dist/assets/{GitView-OSVIn5V1.js → GitView-DBFrDDBv.js} +1 -1
- package/dist/assets/{JsonTreeView-Kgepz4pR.js → JsonTreeView-DLW2Wy1g.js} +1 -1
- package/dist/assets/MarkdownImageGallery-DKIylIK7.js +1 -0
- package/dist/assets/MarkdownRendererImpl-CLv8hxvv.js +12 -0
- package/dist/assets/OnboardingScreen-D2Y6djMw.js +1 -0
- package/dist/assets/{PatchDiff-Cddz02Ya.js → PatchDiff-BuLPx7AN.js} +1 -1
- package/dist/assets/{PierreDiffViewer-B5k0KvPW.js → PierreDiffViewer-BHm4Yr0X.js} +2 -2
- package/dist/assets/{PlanView-BYgHBHDt.js → PlanView-ZYEJn8A_.js} +3 -3
- package/dist/assets/{SessionSwitcherDropdown-ig2OT22Z.js → SessionSwitcherDropdown-rro-SsaO.js} +1 -1
- package/dist/assets/SettingsView-5RmswFZe.js +28 -0
- package/dist/assets/{SettingsWindow-CNHM8ifT.js → SettingsWindow-BZhAYFdS.js} +1 -1
- package/dist/assets/{ToolOutputDialog-DrGeYq2p.js → ToolOutputDialog-Za6V4VMJ.js} +7 -7
- package/dist/assets/{ToolPartDiffPreview-BRmPpe94.js → ToolPartDiffPreview-BL-9ixyC.js} +1 -1
- package/dist/assets/{VirtualizedFileDiff-Dcu8Q-5P.js → VirtualizedFileDiff-CwGocYQd.js} +1 -1
- package/dist/assets/{WalkthroughView-HStEYdD2.js → WalkthroughView-5DyvN03T.js} +2 -2
- package/dist/assets/{computeVirtualFileMetrics-DQE7R9IY.js → computeVirtualFileMetrics-Da00Jg7M.js} +2 -2
- package/dist/assets/contextPanelEmbeddedChat-B-bSg3P5.js +1 -0
- package/dist/assets/de-u7gSnqWs.js +9 -0
- package/dist/assets/es-T9O7aAOr.js +15 -0
- package/dist/assets/fr-Oor7ewbE.js +13 -0
- package/dist/assets/index-BzIpNlNE.css +1 -0
- package/dist/assets/{index-BgQEgA2a.js → index-C0yNhuZw.js} +1 -1
- package/dist/assets/index-DRpChWux.js +7 -0
- package/dist/assets/{isDiffPlainText-XyBCe4eD.js → isDiffPlainText-D9YpoLrV.js} +1 -1
- package/dist/assets/{isFilePlainText-JbqDfa3n.js → isFilePlainText-gTibdNIe.js} +1 -1
- package/dist/assets/ja-DHpqbVmr.js +15 -0
- package/dist/assets/ko-CwLkS3nx.js +15 -0
- package/dist/assets/{main-LfcbGv7C.js → main-D7UcL3VQ.js} +2 -2
- package/dist/assets/main-DPMd2iKS.js +915 -0
- package/dist/assets/markdownCore-DDrHVneM.js +2 -0
- package/dist/assets/{miniChat-CUp_elRz.js → miniChat-O_GVoEbc.js} +2 -2
- package/dist/assets/{mobile-CBSN7BsH.js → mobile-Br4TtAqc.js} +2 -2
- package/dist/assets/{patchFileDiff-DCIXUHRJ.js → patchFileDiff-KNkxM1C1.js} +2 -2
- package/dist/assets/{pl-tHTP6XQx.js → pl-CcZILN8q.js} +4 -4
- package/dist/assets/pt-BR-DYHhVK6o.js +15 -0
- package/dist/assets/{renderElectronMiniChatApp-eZl-5STF.js → renderElectronMiniChatApp-CJpdxTT1.js} +2 -2
- package/dist/assets/renderMobileApp-toj9cXoh.js +25 -0
- package/dist/assets/runtimeEndpointReset-BVmispdD.js +13 -0
- package/dist/assets/scheduledTasksApi-ByKya3Un.js +1 -0
- package/dist/assets/{shikiHighlight-eU8abJ3T.js → shikiHighlight-C7LTbwFx.js} +1 -1
- package/dist/assets/uk-BA2kZR38.js +15 -0
- package/dist/assets/{useAppFontEffects-Bbpz77To.js → useAppFontEffects-BikB6enL.js} +138 -138
- package/dist/assets/useInlineCommentController-CYPvYJDt.js +2 -0
- package/dist/assets/{vendor-codemirror-language-data-Dzt9rWZZ.js → vendor-codemirror-language-data-CLHw8NWn.js} +2 -2
- package/dist/assets/{vendor-marked-i_gIkIP3.js → vendor-marked-CX41MkDF.js} +1 -1
- package/dist/assets/{web-components-DGvnI0zx.js → web-components-GMc3oR3i.js} +1 -1
- package/dist/assets/zh-CN-dlOQK6v9.js +15 -0
- package/dist/assets/zh-TW-BnqQ-WL5.js +15 -0
- package/dist/index.html +4 -4
- package/dist/mini-chat.html +3 -3
- package/dist/mobile.html +3 -3
- package/package.json +2 -2
- package/server/index.js +65 -19
- package/server/lib/agent-tool/DOCUMENTATION.md +21 -6
- package/server/lib/agent-tool/runtime.js +90 -16
- package/server/lib/agent-tool/runtime.test.js +86 -0
- package/server/lib/browser-control/DOCUMENTATION.md +50 -0
- package/server/lib/browser-control/broker.js +154 -0
- package/server/lib/browser-control/broker.test.js +191 -0
- package/server/lib/browser-control/routes.js +48 -0
- package/server/lib/browser-control/routes.test.js +108 -0
- package/server/lib/dev-servers/parse.js +203 -0
- package/server/lib/dev-servers/parse.test.js +174 -0
- package/server/lib/dev-servers/routes.js +135 -0
- package/server/lib/dev-tunnel/DOCUMENTATION.md +57 -0
- package/server/lib/dev-tunnel/client.js +193 -0
- package/server/lib/dev-tunnel/runtime.js +189 -0
- package/server/lib/dev-tunnel/tunnel.test.js +291 -0
- package/server/lib/git/credentials.js +0 -33
- package/server/lib/github/DOCUMENTATION.md +1 -1
- package/server/lib/markdown-image-grants/DOCUMENTATION.md +36 -0
- package/server/lib/markdown-image-grants/routes.js +340 -0
- package/server/lib/markdown-image-grants/routes.test.js +221 -0
- package/server/lib/openchamber-control/DOCUMENTATION.md +9 -0
- package/server/lib/openchamber-control/actions.js +33 -1
- package/server/lib/openchamber-control/screenshots.js +83 -0
- package/server/lib/openchamber-control/screenshots.test.js +84 -0
- package/server/lib/openchamber-control/service.js +141 -2
- package/server/lib/openchamber-control/service.test.js +55 -0
- package/server/lib/opencode/core-routes.js +31 -52
- package/server/lib/opencode/core-routes.test.js +37 -9
- package/server/lib/opencode/feature-routes-runtime.js +15 -0
- package/server/lib/opencode/server-startup-runtime.js +22 -1
- package/server/lib/opencode/server-startup-runtime.test.js +44 -0
- package/server/lib/opencode/settings-helpers.js +3 -9
- package/server/lib/projects/project-config.js +181 -2
- package/server/lib/projects/project-config.test.js +295 -0
- package/server/lib/quota/DOCUMENTATION.md +4 -2
- package/server/lib/quota/credentials/providers.js +0 -7
- package/server/lib/quota/credentials/store.js +11 -1
- package/server/lib/quota/credentials/store.test.js +9 -1
- package/server/lib/quota/providers/opencode-go.js +35 -35
- package/server/lib/quota/providers/opencode-go.test.js +52 -7
- package/server/lib/quota/routes.js +0 -2
- package/server/lib/relay/DOCUMENTATION.md +2 -0
- package/server/lib/relay/tunnel-host.js +157 -33
- package/server/lib/relay/tunnel-host.test.js +147 -0
- package/server/lib/scheduled-tasks/DOCUMENTATION.md +49 -0
- package/server/lib/scheduled-tasks/issue-2710-double-execution.test.js +488 -0
- package/server/lib/scheduled-tasks/routes.js +6 -0
- package/server/lib/scheduled-tasks/runtime.js +369 -108
- package/server/lib/scheduled-tasks/service.js +7 -1
- package/server/lib/scheduled-tasks/service.test.js +20 -0
- package/server/lib/walkthrough/index.js +0 -2
- package/server/sse-routes.test.js +3 -0
- package/dist/assets/FilesView-WkxsWHBE.js +0 -14
- package/dist/assets/MarkdownRendererImpl-CKAsRfIk.js +0 -12
- package/dist/assets/OnboardingScreen-BCgYA7J5.js +0 -1
- package/dist/assets/SettingsView-e7Fmxnz8.js +0 -28
- package/dist/assets/contextPanelEmbeddedChat-5VGWIT_J.js +0 -1
- package/dist/assets/de-B6t6T54h.js +0 -9
- package/dist/assets/es-DH9NUKge.js +0 -15
- package/dist/assets/fr-Do4t2KmA.js +0 -13
- package/dist/assets/index-B45s9aAX.css +0 -1
- package/dist/assets/index-CNrN5qDs.js +0 -7
- package/dist/assets/ja-DJT9EM80.js +0 -15
- package/dist/assets/ko-CfWRq2p4.js +0 -15
- package/dist/assets/main-B4oBRI9u.js +0 -193
- package/dist/assets/markdownCore-A3_L34oS.js +0 -2
- package/dist/assets/pt-BR-BDEzzltP.js +0 -15
- package/dist/assets/renderMobileApp-DA7wpIBi.js +0 -23
- package/dist/assets/runtimeEndpointReset-D5izT-u5.js +0 -13
- package/dist/assets/scheduledTasksApi-CTJdfSWc.js +0 -1
- package/dist/assets/uk-B6Q32nyk.js +0 -15
- package/dist/assets/useInlineCommentController-D7zs7-BQ.js +0 -2
- package/dist/assets/vendor-zumer-snapdom-Btyu_Xi2.js +0 -8
- package/dist/assets/zh-CN-7MGcwGaC.js +0 -15
- package/dist/assets/zh-TW-CFPfqxlL.js +0 -15
- package/server/lib/preview/proxy-runtime.js +0 -1604
- package/server/lib/preview/proxy-runtime.test.js +0 -528
- package/server/lib/quota/opencode-go-credentials.js +0 -11
- package/server/lib/quota/opencode-go-credentials.test.js +0 -32
- package/server/lib/quota/routes.test.js +0 -40
|
@@ -327,7 +327,7 @@ export const createScheduledTasksRuntime = (deps) => {
|
|
|
327
327
|
if (!task || !task.enabled) {
|
|
328
328
|
return;
|
|
329
329
|
}
|
|
330
|
-
queueTaskRun(projectID, taskID, 'scheduled');
|
|
330
|
+
queueTaskRun(projectID, taskID, 'scheduled', nextRunAt);
|
|
331
331
|
pumpQueue();
|
|
332
332
|
}, boundedDelay);
|
|
333
333
|
|
|
@@ -429,13 +429,18 @@ export const createScheduledTasksRuntime = (deps) => {
|
|
|
429
429
|
}
|
|
430
430
|
};
|
|
431
431
|
|
|
432
|
-
const queueTaskRun = (projectID, taskID, reason) => {
|
|
432
|
+
const queueTaskRun = (projectID, taskID, reason, scheduledFor) => {
|
|
433
433
|
const taskKey = buildTaskKey(projectID, taskID);
|
|
434
434
|
if (queuedTaskKeys.has(taskKey) || runningTaskKeys.has(taskKey)) {
|
|
435
435
|
return;
|
|
436
436
|
}
|
|
437
437
|
queuedTaskKeys.add(taskKey);
|
|
438
|
-
queue.push({
|
|
438
|
+
queue.push({
|
|
439
|
+
projectID,
|
|
440
|
+
taskID,
|
|
441
|
+
reason,
|
|
442
|
+
...(Number.isFinite(scheduledFor) ? { scheduledFor } : {}),
|
|
443
|
+
});
|
|
439
444
|
};
|
|
440
445
|
|
|
441
446
|
const canRunTask = (projectID) => {
|
|
@@ -605,7 +610,51 @@ export const createScheduledTasksRuntime = (deps) => {
|
|
|
605
610
|
};
|
|
606
611
|
};
|
|
607
612
|
|
|
608
|
-
const
|
|
613
|
+
const releaseRunningSlot = (projectID, taskKey) => {
|
|
614
|
+
runningTaskKeys.delete(taskKey);
|
|
615
|
+
runningGlobalCount = Math.max(0, runningGlobalCount - 1);
|
|
616
|
+
const nextProjectCount = Math.max(0, (runningCountByProject.get(projectID) || 1) - 1);
|
|
617
|
+
if (nextProjectCount === 0) {
|
|
618
|
+
runningCountByProject.delete(projectID);
|
|
619
|
+
} else {
|
|
620
|
+
runningCountByProject.set(projectID, nextProjectCount);
|
|
621
|
+
}
|
|
622
|
+
};
|
|
623
|
+
|
|
624
|
+
/**
|
|
625
|
+
* Arm a timer only for a future occurrence. Scheduling a past nextRunAt
|
|
626
|
+
* (delay 0 + jitter) re-enters the claim path immediately and can spin —
|
|
627
|
+
* especially for once tasks where the claim cannot advance nextRunAt.
|
|
628
|
+
*/
|
|
629
|
+
const scheduleFutureRun = (projectID, taskID, nextRunAt, fromMs = Date.now()) => {
|
|
630
|
+
if (!Number.isFinite(nextRunAt)) {
|
|
631
|
+
return false;
|
|
632
|
+
}
|
|
633
|
+
const base = Number.isFinite(fromMs) ? fromMs : Date.now();
|
|
634
|
+
if (nextRunAt <= base) {
|
|
635
|
+
return false;
|
|
636
|
+
}
|
|
637
|
+
scheduleTask(projectID, taskID, nextRunAt);
|
|
638
|
+
return true;
|
|
639
|
+
};
|
|
640
|
+
|
|
641
|
+
const rearmFromTaskOrCompute = (projectID, taskID, fallbackTask, fromMs) => {
|
|
642
|
+
const latest = (tasksByProject.get(projectID)?.get(taskID)) || fallbackTask;
|
|
643
|
+
if (!latest?.enabled) {
|
|
644
|
+
return;
|
|
645
|
+
}
|
|
646
|
+
const base = Number.isFinite(fromMs) ? fromMs : Date.now();
|
|
647
|
+
const persistedNext = latest.state?.nextRunAt;
|
|
648
|
+
// Prefer a still-future persisted slot; never re-arm a past occurrence
|
|
649
|
+
// (that created silent once-task loser loops and claim-failed retry spam).
|
|
650
|
+
if (scheduleFutureRun(projectID, taskID, persistedNext, base)) {
|
|
651
|
+
return;
|
|
652
|
+
}
|
|
653
|
+
const computedNext = computeNextRunAt(latest, base);
|
|
654
|
+
scheduleFutureRun(projectID, taskID, computedNext, base);
|
|
655
|
+
};
|
|
656
|
+
|
|
657
|
+
const runTask = async (projectID, taskID, reason, scheduledFor) => {
|
|
609
658
|
const taskMap = tasksByProject.get(projectID);
|
|
610
659
|
const task = taskMap?.get(taskID);
|
|
611
660
|
if (!task || !task.enabled) {
|
|
@@ -621,125 +670,328 @@ export const createScheduledTasksRuntime = (deps) => {
|
|
|
621
670
|
runningGlobalCount += 1;
|
|
622
671
|
runningCountByProject.set(projectID, (runningCountByProject.get(projectID) || 0) + 1);
|
|
623
672
|
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
673
|
+
// Every path that holds the running slot must exit through this finally so
|
|
674
|
+
// lock timeouts / fs errors on claim, manual-start, or completion writes
|
|
675
|
+
// cannot permanently stuck-run the task in this process.
|
|
676
|
+
try {
|
|
677
|
+
const runStartedAt = Date.now();
|
|
678
|
+
|
|
679
|
+
// Scheduled dispatches must claim the occurrence in shared project config
|
|
680
|
+
// before creating a session. Two server instances (e.g. CLI serve + desktop)
|
|
681
|
+
// each arm their own timer; without this claim both would run (#2710).
|
|
682
|
+
if (reason === 'scheduled') {
|
|
683
|
+
if (!Number.isFinite(scheduledFor)) {
|
|
684
|
+
return { ok: false, skipped: true, reason: 'missing-scheduled-for' };
|
|
685
|
+
}
|
|
635
686
|
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
687
|
+
const nextAfterClaim = computeNextRunAt(task, Math.max(runStartedAt, scheduledFor + 1));
|
|
688
|
+
const claimPatch = {
|
|
689
|
+
lastScheduledFor: Math.round(scheduledFor),
|
|
690
|
+
lastRunAt: runStartedAt,
|
|
691
|
+
lastStatus: 'running',
|
|
692
|
+
lastError: undefined,
|
|
693
|
+
updatedAt: runStartedAt,
|
|
694
|
+
// Always set nextRunAt so a past once-slot is cleared when there is
|
|
695
|
+
// no following occurrence (omitting the key would leave the past value).
|
|
696
|
+
nextRunAt: Number.isFinite(nextAfterClaim) ? nextAfterClaim : undefined,
|
|
697
|
+
};
|
|
698
|
+
|
|
699
|
+
// Duplicate protection is solely lastScheduledFor within slack of this
|
|
700
|
+
// occurrence. Do not reject on advanced disk nextRunAt: lastScheduledFor
|
|
701
|
+
// persists across days, so a second-instance sync inside TASK_DUE_SLACK_MS
|
|
702
|
+
// would otherwise suppress every armed occurrence after the first.
|
|
703
|
+
const canClaimOccurrence = (candidate) => {
|
|
704
|
+
if (!candidate?.enabled) {
|
|
705
|
+
return false;
|
|
706
|
+
}
|
|
707
|
+
const lastScheduledFor = candidate.state?.lastScheduledFor;
|
|
708
|
+
if (
|
|
709
|
+
Number.isFinite(lastScheduledFor)
|
|
710
|
+
&& Math.abs(lastScheduledFor - scheduledFor) <= TASK_DUE_SLACK_MS
|
|
711
|
+
) {
|
|
712
|
+
return false;
|
|
713
|
+
}
|
|
714
|
+
return true;
|
|
715
|
+
};
|
|
716
|
+
|
|
717
|
+
let claimResult;
|
|
718
|
+
try {
|
|
719
|
+
if (typeof projectConfigRuntime.updateScheduledTaskStateIf === 'function') {
|
|
720
|
+
claimResult = await projectConfigRuntime.updateScheduledTaskStateIf(
|
|
721
|
+
projectID,
|
|
722
|
+
taskID,
|
|
723
|
+
canClaimOccurrence,
|
|
724
|
+
claimPatch,
|
|
725
|
+
);
|
|
726
|
+
} else {
|
|
727
|
+
// Fallback for older test doubles: unconditional update (single-instance only).
|
|
728
|
+
claimResult = await projectConfigRuntime.updateScheduledTaskState(projectID, taskID, claimPatch);
|
|
729
|
+
claimResult = { ...claimResult, updated: Boolean(claimResult?.task) };
|
|
730
|
+
}
|
|
731
|
+
} catch (claimError) {
|
|
732
|
+
const message = safeErrorMessage(claimError);
|
|
733
|
+
logger.warn?.('[ScheduledTasks] occurrence claim failed', {
|
|
734
|
+
projectID,
|
|
735
|
+
taskID,
|
|
736
|
+
error: message,
|
|
737
|
+
});
|
|
738
|
+
rearmFromTaskOrCompute(projectID, taskID, task, Math.max(runStartedAt, scheduledFor + 1));
|
|
739
|
+
|
|
740
|
+
// Best-effort record so once tasks are not left enabled-but-inert with
|
|
741
|
+
// no UI signal. Do not clobber a winner that claimed this occurrence.
|
|
742
|
+
const claimFailurePatch = {
|
|
743
|
+
lastStatus: 'error',
|
|
744
|
+
lastError: `Scheduled claim failed: ${message}`,
|
|
745
|
+
updatedAt: Date.now(),
|
|
746
|
+
};
|
|
747
|
+
try {
|
|
748
|
+
if (typeof projectConfigRuntime.updateScheduledTaskStateIf === 'function') {
|
|
749
|
+
const recorded = await projectConfigRuntime.updateScheduledTaskStateIf(
|
|
750
|
+
projectID,
|
|
751
|
+
taskID,
|
|
752
|
+
(candidate) => {
|
|
753
|
+
const lastScheduledFor = candidate.state?.lastScheduledFor;
|
|
754
|
+
if (
|
|
755
|
+
Number.isFinite(lastScheduledFor)
|
|
756
|
+
&& Math.abs(lastScheduledFor - scheduledFor) <= TASK_DUE_SLACK_MS
|
|
757
|
+
) {
|
|
758
|
+
return false;
|
|
759
|
+
}
|
|
760
|
+
return true;
|
|
761
|
+
},
|
|
762
|
+
claimFailurePatch,
|
|
763
|
+
);
|
|
764
|
+
if (recorded.task) {
|
|
765
|
+
updateInMemoryTask(projectID, recorded.task);
|
|
766
|
+
}
|
|
767
|
+
} else {
|
|
768
|
+
const recorded = await projectConfigRuntime.updateScheduledTaskState(
|
|
769
|
+
projectID,
|
|
770
|
+
taskID,
|
|
771
|
+
claimFailurePatch,
|
|
772
|
+
);
|
|
773
|
+
if (recorded.task) {
|
|
774
|
+
updateInMemoryTask(projectID, recorded.task);
|
|
775
|
+
}
|
|
776
|
+
}
|
|
777
|
+
} catch {
|
|
778
|
+
updateInMemoryTask(projectID, {
|
|
779
|
+
...task,
|
|
780
|
+
state: {
|
|
781
|
+
...(task.state || {}),
|
|
782
|
+
...claimFailurePatch,
|
|
783
|
+
},
|
|
784
|
+
});
|
|
785
|
+
}
|
|
786
|
+
|
|
787
|
+
return { ok: false, skipped: true, reason: 'claim-failed', error: message };
|
|
788
|
+
}
|
|
640
789
|
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
790
|
+
if (!claimResult?.updated) {
|
|
791
|
+
if (claimResult?.task) {
|
|
792
|
+
updateInMemoryTask(projectID, claimResult.task);
|
|
793
|
+
// Loser must not schedule a past nextRunAt (once-task spin).
|
|
794
|
+
rearmFromTaskOrCompute(
|
|
795
|
+
projectID,
|
|
796
|
+
taskID,
|
|
797
|
+
claimResult.task,
|
|
798
|
+
Math.max(Date.now(), scheduledFor + 1),
|
|
799
|
+
);
|
|
800
|
+
}
|
|
801
|
+
return { ok: false, skipped: true, reason: 'occurrence-claimed' };
|
|
802
|
+
}
|
|
649
803
|
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
clearTimeout(timeoutID);
|
|
804
|
+
if (claimResult.task) {
|
|
805
|
+
updateInMemoryTask(projectID, claimResult.task);
|
|
653
806
|
}
|
|
654
|
-
}
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
807
|
+
} else {
|
|
808
|
+
try {
|
|
809
|
+
const startResult = await projectConfigRuntime.updateScheduledTaskState(projectID, taskID, {
|
|
810
|
+
lastRunAt: runStartedAt,
|
|
811
|
+
lastStatus: 'running',
|
|
812
|
+
lastError: undefined,
|
|
813
|
+
updatedAt: runStartedAt,
|
|
814
|
+
});
|
|
815
|
+
if (startResult.task) {
|
|
816
|
+
updateInMemoryTask(projectID, startResult.task);
|
|
817
|
+
}
|
|
818
|
+
} catch (startError) {
|
|
819
|
+
const message = safeErrorMessage(startError);
|
|
820
|
+
logger.warn?.('[ScheduledTasks] manual start state write failed', {
|
|
821
|
+
projectID,
|
|
822
|
+
taskID,
|
|
823
|
+
error: message,
|
|
824
|
+
});
|
|
825
|
+
return { ok: false, error: message, reason: 'start-state-failed' };
|
|
826
|
+
}
|
|
827
|
+
}
|
|
828
|
+
|
|
829
|
+
let status = 'success';
|
|
830
|
+
let sessionID;
|
|
831
|
+
let durationMs = 0;
|
|
832
|
+
let errorMessage;
|
|
673
833
|
|
|
674
|
-
const finishedAt = Date.now();
|
|
675
|
-
if (!durationMs) {
|
|
676
|
-
durationMs = Math.max(0, finishedAt - runStartedAt);
|
|
677
|
-
}
|
|
678
|
-
let latestTask = (tasksByProject.get(projectID)?.get(taskID)) || task;
|
|
679
|
-
const shouldConsumeOneTimeTask = latestTask?.schedule?.kind === 'once' && reason === 'scheduled';
|
|
680
|
-
if (shouldConsumeOneTimeTask && latestTask?.enabled) {
|
|
681
834
|
try {
|
|
682
|
-
const
|
|
683
|
-
|
|
684
|
-
|
|
835
|
+
const runPromise = runTaskWithWatchdog(projectID, task, reason);
|
|
836
|
+
let timeoutID;
|
|
837
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
838
|
+
timeoutID = setTimeout(() => {
|
|
839
|
+
reject(new Error('scheduled task run timed out'));
|
|
840
|
+
}, maxRunDurationMs);
|
|
841
|
+
});
|
|
842
|
+
|
|
843
|
+
const result = await Promise.race([runPromise, timeoutPromise]).finally(() => {
|
|
844
|
+
if (timeoutID) {
|
|
845
|
+
clearTimeout(timeoutID);
|
|
846
|
+
}
|
|
685
847
|
});
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
logger.
|
|
848
|
+
sessionID = result.sessionID;
|
|
849
|
+
durationMs = result.durationMs;
|
|
850
|
+
status = 'success';
|
|
851
|
+
logger.info?.(
|
|
852
|
+
'[ScheduledTasks] run completed',
|
|
853
|
+
{ projectID, taskID, status, reason, sessionID, durationMs }
|
|
854
|
+
);
|
|
855
|
+
} catch (error) {
|
|
856
|
+
status = 'error';
|
|
857
|
+
errorMessage = safeErrorMessage(error);
|
|
858
|
+
logger.warn?.('[ScheduledTasks] run failed', {
|
|
690
859
|
projectID,
|
|
691
860
|
taskID,
|
|
692
|
-
|
|
861
|
+
reason,
|
|
862
|
+
status,
|
|
863
|
+
error: errorMessage,
|
|
693
864
|
});
|
|
694
865
|
}
|
|
695
|
-
}
|
|
696
866
|
|
|
697
|
-
|
|
867
|
+
const finishedAt = Date.now();
|
|
868
|
+
if (!durationMs) {
|
|
869
|
+
durationMs = Math.max(0, finishedAt - runStartedAt);
|
|
870
|
+
}
|
|
871
|
+
let latestTask = (tasksByProject.get(projectID)?.get(taskID)) || task;
|
|
872
|
+
const shouldConsumeOneTimeTask = latestTask?.schedule?.kind === 'once' && reason === 'scheduled';
|
|
873
|
+
if (shouldConsumeOneTimeTask && latestTask?.enabled) {
|
|
874
|
+
try {
|
|
875
|
+
const consumed = await projectConfigRuntime.upsertScheduledTask(projectID, {
|
|
876
|
+
...latestTask,
|
|
877
|
+
enabled: false,
|
|
878
|
+
});
|
|
879
|
+
latestTask = consumed.task || latestTask;
|
|
880
|
+
updateInMemoryTask(projectID, latestTask);
|
|
881
|
+
} catch (consumeError) {
|
|
882
|
+
logger.warn?.('[ScheduledTasks] failed to consume one-time task', {
|
|
883
|
+
projectID,
|
|
884
|
+
taskID,
|
|
885
|
+
error: safeErrorMessage(consumeError),
|
|
886
|
+
});
|
|
887
|
+
}
|
|
888
|
+
}
|
|
698
889
|
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
890
|
+
const nextRunAt = computeNextRunAt(latestTask, finishedAt);
|
|
891
|
+
|
|
892
|
+
const statePatch = {
|
|
893
|
+
lastStatus: status,
|
|
894
|
+
lastDurationMs: durationMs,
|
|
895
|
+
lastError: status === 'error' ? errorMessage : undefined,
|
|
896
|
+
lastSessionId: status === 'success' ? sessionID : undefined,
|
|
897
|
+
nextRunAt: Number.isFinite(nextRunAt) ? nextRunAt : undefined,
|
|
898
|
+
updatedAt: finishedAt,
|
|
899
|
+
};
|
|
900
|
+
|
|
901
|
+
let stateResult = { task: null };
|
|
902
|
+
try {
|
|
903
|
+
stateResult = await projectConfigRuntime.updateScheduledTaskState(projectID, taskID, statePatch);
|
|
904
|
+
if (stateResult.task) {
|
|
905
|
+
updateInMemoryTask(projectID, stateResult.task);
|
|
906
|
+
if (stateResult.task.enabled) {
|
|
907
|
+
scheduleFutureRun(
|
|
908
|
+
projectID,
|
|
909
|
+
taskID,
|
|
910
|
+
stateResult.task.state?.nextRunAt,
|
|
911
|
+
finishedAt,
|
|
912
|
+
);
|
|
913
|
+
}
|
|
914
|
+
}
|
|
915
|
+
} catch (persistError) {
|
|
916
|
+
const message = safeErrorMessage(persistError);
|
|
917
|
+
logger.warn?.('[ScheduledTasks] run completion state write failed', {
|
|
918
|
+
projectID,
|
|
919
|
+
taskID,
|
|
920
|
+
reason,
|
|
921
|
+
error: message,
|
|
922
|
+
});
|
|
923
|
+
|
|
924
|
+
// Keep in-memory status terminal so this process does not advertise
|
|
925
|
+
// a stuck "running" task after the session already finished.
|
|
926
|
+
const recoveredTask = {
|
|
927
|
+
...latestTask,
|
|
928
|
+
state: {
|
|
929
|
+
...(latestTask.state || {}),
|
|
930
|
+
lastStatus: status,
|
|
931
|
+
lastDurationMs: durationMs,
|
|
932
|
+
lastError: status === 'error' ? errorMessage : undefined,
|
|
933
|
+
lastSessionId: status === 'success' ? sessionID : undefined,
|
|
934
|
+
nextRunAt: Number.isFinite(nextRunAt) ? nextRunAt : undefined,
|
|
935
|
+
updatedAt: finishedAt,
|
|
936
|
+
},
|
|
937
|
+
};
|
|
938
|
+
updateInMemoryTask(projectID, recoveredTask);
|
|
939
|
+
|
|
940
|
+
// Best-effort single retry so persisted lastStatus does not stay 'running'.
|
|
941
|
+
try {
|
|
942
|
+
const retry = await projectConfigRuntime.updateScheduledTaskState(projectID, taskID, statePatch);
|
|
943
|
+
if (retry.task) {
|
|
944
|
+
updateInMemoryTask(projectID, retry.task);
|
|
945
|
+
stateResult = retry;
|
|
946
|
+
if (retry.task.enabled) {
|
|
947
|
+
scheduleFutureRun(projectID, taskID, retry.task.state?.nextRunAt, finishedAt);
|
|
948
|
+
}
|
|
949
|
+
}
|
|
950
|
+
} catch (retryError) {
|
|
951
|
+
logger.warn?.('[ScheduledTasks] run completion state retry failed', {
|
|
952
|
+
projectID,
|
|
953
|
+
taskID,
|
|
954
|
+
reason,
|
|
955
|
+
error: safeErrorMessage(retryError),
|
|
956
|
+
});
|
|
957
|
+
stateResult = { task: recoveredTask };
|
|
958
|
+
rearmFromTaskOrCompute(projectID, taskID, recoveredTask, finishedAt);
|
|
959
|
+
}
|
|
707
960
|
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
961
|
+
// The session already ran — surface persist failure without treating a
|
|
962
|
+
// successful dispatch as a hard run failure (manual runNow would 500).
|
|
963
|
+
return {
|
|
964
|
+
ok: status === 'success',
|
|
965
|
+
status,
|
|
966
|
+
sessionID,
|
|
967
|
+
task: stateResult.task || recoveredTask,
|
|
968
|
+
error: status === 'error' ? errorMessage : undefined,
|
|
969
|
+
persistError: message,
|
|
970
|
+
reason: 'completion-state-failed',
|
|
971
|
+
};
|
|
713
972
|
}
|
|
714
|
-
}
|
|
715
973
|
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
974
|
+
try {
|
|
975
|
+
emitTaskRunEvent?.({
|
|
976
|
+
projectID,
|
|
977
|
+
taskID,
|
|
978
|
+
ranAt: finishedAt,
|
|
979
|
+
status,
|
|
980
|
+
...(sessionID ? { sessionID } : {}),
|
|
981
|
+
});
|
|
982
|
+
} catch {
|
|
983
|
+
}
|
|
726
984
|
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
985
|
+
return {
|
|
986
|
+
ok: status === 'success',
|
|
987
|
+
status,
|
|
988
|
+
sessionID,
|
|
989
|
+
task: stateResult.task || null,
|
|
990
|
+
error: errorMessage,
|
|
991
|
+
};
|
|
992
|
+
} finally {
|
|
993
|
+
releaseRunningSlot(projectID, taskKey);
|
|
734
994
|
}
|
|
735
|
-
|
|
736
|
-
return {
|
|
737
|
-
ok: status === 'success',
|
|
738
|
-
status,
|
|
739
|
-
sessionID,
|
|
740
|
-
task: stateResult.task || null,
|
|
741
|
-
error: errorMessage,
|
|
742
|
-
};
|
|
743
995
|
};
|
|
744
996
|
|
|
745
997
|
const pumpQueue = () => {
|
|
@@ -761,9 +1013,18 @@ export const createScheduledTasksRuntime = (deps) => {
|
|
|
761
1013
|
queuedTaskKeys.delete(taskKey);
|
|
762
1014
|
consumed = true;
|
|
763
1015
|
|
|
764
|
-
void runTask(item.projectID, item.taskID, item.reason
|
|
765
|
-
|
|
766
|
-
|
|
1016
|
+
void runTask(item.projectID, item.taskID, item.reason, item.scheduledFor)
|
|
1017
|
+
.catch((error) => {
|
|
1018
|
+
logger.warn?.('[ScheduledTasks] queued run rejected', {
|
|
1019
|
+
projectID: item.projectID,
|
|
1020
|
+
taskID: item.taskID,
|
|
1021
|
+
reason: item.reason,
|
|
1022
|
+
error: safeErrorMessage(error),
|
|
1023
|
+
});
|
|
1024
|
+
})
|
|
1025
|
+
.finally(() => {
|
|
1026
|
+
pumpQueue();
|
|
1027
|
+
});
|
|
767
1028
|
}
|
|
768
1029
|
|
|
769
1030
|
if (!consumed && queue.length > 0) {
|
|
@@ -152,7 +152,13 @@ export const createScheduledTaskService = (dependencies) => {
|
|
|
152
152
|
if (!result.ok) {
|
|
153
153
|
throw new OpenChamberControlError(result.error || 'Task run failed', 500, { task: result.task });
|
|
154
154
|
}
|
|
155
|
-
return {
|
|
155
|
+
return {
|
|
156
|
+
task: result.task,
|
|
157
|
+
sessionId: result.sessionID,
|
|
158
|
+
...(typeof result.persistError === 'string' && result.persistError.trim()
|
|
159
|
+
? { persistError: result.persistError.trim() }
|
|
160
|
+
: {}),
|
|
161
|
+
};
|
|
156
162
|
};
|
|
157
163
|
|
|
158
164
|
const setEnabled = async (projectID, taskID, enabled) => {
|
|
@@ -262,3 +262,23 @@ describe('scheduled-task service remove', () => {
|
|
|
262
262
|
expect(Array.isArray(tasks)).toBe(true);
|
|
263
263
|
});
|
|
264
264
|
});
|
|
265
|
+
|
|
266
|
+
describe('scheduled-task service run', () => {
|
|
267
|
+
it('forwards persistError when the runtime reports a completion persist failure', async () => {
|
|
268
|
+
const { service } = createService({
|
|
269
|
+
scheduledTasksRuntime: {
|
|
270
|
+
runNow: vi.fn(async () => ({
|
|
271
|
+
ok: true,
|
|
272
|
+
sessionID: 'sess-1',
|
|
273
|
+
task: { id: 'task-1', state: { lastStatus: 'success' } },
|
|
274
|
+
persistError: 'timeout acquiring project config lock for project-test',
|
|
275
|
+
reason: 'completion-state-failed',
|
|
276
|
+
})),
|
|
277
|
+
},
|
|
278
|
+
});
|
|
279
|
+
|
|
280
|
+
const result = await service.run('project-test', 'task-1');
|
|
281
|
+
expect(result.sessionId).toBe('sess-1');
|
|
282
|
+
expect(result.persistError).toMatch(/timeout acquiring project config lock/);
|
|
283
|
+
});
|
|
284
|
+
});
|
|
@@ -111,8 +111,6 @@ const jobKey = (repoRoot, sourceKeyValue) => `${repoRoot}\0${sourceKeyValue}`;
|
|
|
111
111
|
* would imply progress where there is none. `retrying` appears only when a
|
|
112
112
|
* provider rejects the schema and the prompt-side fallback runs.
|
|
113
113
|
*/
|
|
114
|
-
export const GENERATION_STAGES = ['collecting', 'asking', 'retrying', 'assembling'];
|
|
115
|
-
|
|
116
114
|
const setStage = (repoRoot, sourceKeyValue, stage) => {
|
|
117
115
|
const job = jobs.get(jobKey(repoRoot, sourceKeyValue));
|
|
118
116
|
if (job) job.stage = stage;
|