shipmyagent 1.0.217 → 1.0.229
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/main/agent/Agent.d.ts.map +1 -1
- package/bin/main/agent/Agent.js +237 -114
- package/bin/main/agent/Agent.js.map +1 -1
- package/bin/main/model/CreateModel.d.ts.map +1 -1
- package/bin/main/model/CreateModel.js +11 -1
- package/bin/main/model/CreateModel.js.map +1 -1
- package/bin/main/tools/shell/Tool.d.ts.map +1 -1
- package/bin/main/tools/shell/Tool.js +49 -3
- package/bin/main/tools/shell/Tool.js.map +1 -1
- package/bin/services/chat/Action.d.ts.map +1 -1
- package/bin/services/chat/Action.js +51 -5
- package/bin/services/chat/Action.js.map +1 -1
- package/bin/services/chat/Index.d.ts.map +1 -1
- package/bin/services/chat/Index.js +12 -0
- package/bin/services/chat/Index.js.map +1 -1
- package/bin/services/chat/PROMPT.direct.txt +29 -17
- package/bin/services/chat/PROMPT.txt +1 -1
- package/bin/services/chat/channels/feishu/PROMPT.direct.txt +1 -1
- package/bin/services/chat/channels/qq/PROMPT.direct.txt +1 -1
- package/bin/services/chat/channels/telegram/PROMPT.direct.txt +2 -2
- package/bin/services/chat/runtime/ChatQueueWorker.d.ts.map +1 -1
- package/bin/services/chat/runtime/ChatQueueWorker.js +110 -7
- package/bin/services/chat/runtime/ChatQueueWorker.js.map +1 -1
- package/bin/services/chat/runtime/ChatSendRegistry.d.ts.map +1 -1
- package/bin/services/chat/runtime/ChatSendRegistry.js +9 -0
- package/bin/services/chat/runtime/ChatSendRegistry.js.map +1 -1
- package/bin/services/chat/runtime/ChatkeySend.d.ts.map +1 -1
- package/bin/services/chat/runtime/ChatkeySend.js +2 -1
- package/bin/services/chat/runtime/ChatkeySend.js.map +1 -1
- package/bin/services/chat/runtime/DirectDispatchParser.d.ts.map +1 -1
- package/bin/services/chat/runtime/DirectDispatchParser.js +136 -133
- package/bin/services/chat/runtime/DirectDispatchParser.js.map +1 -1
- package/bin/services/chat/types/DirectDispatch.d.ts.map +1 -1
- package/bin/services/memory/runtime/Extractor.d.ts.map +1 -1
- package/bin/services/memory/runtime/Extractor.js +19 -1
- package/bin/services/memory/runtime/Extractor.js.map +1 -1
- package/bin/services/memory/runtime/Manager.d.ts.map +1 -1
- package/bin/services/memory/runtime/Manager.js +14 -2
- package/bin/services/memory/runtime/Manager.js.map +1 -1
- package/bin/services/memory/runtime/Service.d.ts.map +1 -1
- package/bin/services/memory/runtime/Service.js +11 -7
- package/bin/services/memory/runtime/Service.js.map +1 -1
- package/bin/services/task/Action.d.ts.map +1 -1
- package/bin/services/task/Action.js +37 -14
- package/bin/services/task/Action.js.map +1 -1
- package/bin/services/task/Index.d.ts.map +1 -1
- package/bin/services/task/Index.js +121 -16
- package/bin/services/task/Index.js.map +1 -1
- package/bin/services/task/PROMPT.txt +9 -4
- package/bin/services/task/Scheduler.d.ts.map +1 -1
- package/bin/services/task/Scheduler.js +14 -19
- package/bin/services/task/Scheduler.js.map +1 -1
- package/bin/services/task/runtime/Model.d.ts.map +1 -1
- package/bin/services/task/runtime/Model.js +140 -9
- package/bin/services/task/runtime/Model.js.map +1 -1
- package/bin/services/task/runtime/Paths.d.ts.map +1 -1
- package/bin/services/task/runtime/Paths.js +8 -7
- package/bin/services/task/runtime/Paths.js.map +1 -1
- package/bin/services/task/types/Task.d.ts.map +1 -1
- package/bin/utils/logger/Fetch.d.ts.map +1 -1
- package/bin/utils/logger/Fetch.js +1 -5
- package/bin/utils/logger/Fetch.js.map +1 -1
- package/bin/utils/logger/Format.d.ts.map +1 -1
- package/bin/utils/logger/Format.js +221 -105
- package/bin/utils/logger/Format.js.map +1 -1
- package/bin/utils/logger/Logger.d.ts.map +1 -1
- package/bin/utils/logger/Logger.js +106 -24
- package/bin/utils/logger/Logger.js.map +1 -1
- package/package.json +1 -1
- package/src/services/chat/PROMPT.direct.txt +29 -17
- package/src/services/chat/PROMPT.txt +1 -1
- package/src/services/chat/channels/feishu/PROMPT.direct.txt +1 -1
- package/src/services/chat/channels/qq/PROMPT.direct.txt +1 -1
- package/src/services/chat/channels/telegram/PROMPT.direct.txt +2 -2
- package/src/services/task/PROMPT.txt +9 -4
- package/test/chat/direct-delay-nonblocking.test.mjs +112 -0
- package/test/chat/direct-dispatch-parser.test.mjs +43 -0
- package/test/chat/send-time-timezone-parse.test.mjs +47 -0
- package/test/task/schedule-timezone-validation.test.mjs +76 -0
|
@@ -42,6 +42,10 @@ export async function runContextMemoryMaintenance(params) {
|
|
|
42
42
|
const unmemorizedCount = totalEntries - lastMemorizedEntryCount;
|
|
43
43
|
if (unmemorizedCount < extractMinEntries)
|
|
44
44
|
return;
|
|
45
|
+
await runtime.logger.log("info", "[agent] memory calling", {
|
|
46
|
+
contextId,
|
|
47
|
+
entryRange: [lastMemorizedEntryCount, totalEntries],
|
|
48
|
+
});
|
|
45
49
|
void extractAndSaveMemory({
|
|
46
50
|
context: runtime,
|
|
47
51
|
contextId,
|
|
@@ -57,7 +61,7 @@ async function extractAndSaveMemory(params) {
|
|
|
57
61
|
const { context: runtime, contextId, startIndex, endIndex } = params;
|
|
58
62
|
const logger = getLogger(runtime.rootPath, "info");
|
|
59
63
|
try {
|
|
60
|
-
await logger.log("info", "
|
|
64
|
+
await logger.log("info", "[agent] memory extracting", {
|
|
61
65
|
contextId,
|
|
62
66
|
entryRange: [startIndex, endIndex],
|
|
63
67
|
});
|
|
@@ -77,13 +81,13 @@ async function extractAndSaveMemory(params) {
|
|
|
77
81
|
lastExtractedAt: Date.now(),
|
|
78
82
|
});
|
|
79
83
|
await checkAndCompressMemory(runtime, contextId, model);
|
|
80
|
-
await logger.log("info", "
|
|
84
|
+
await logger.log("info", "[agent] memory extracted", {
|
|
81
85
|
contextId,
|
|
82
86
|
entryRange: [startIndex, endIndex],
|
|
83
87
|
});
|
|
84
88
|
}
|
|
85
89
|
catch (error) {
|
|
86
|
-
await logger.log("error", "
|
|
90
|
+
await logger.log("error", "[agent] memory extract failed", {
|
|
87
91
|
contextId,
|
|
88
92
|
error: String(error),
|
|
89
93
|
});
|
|
@@ -101,7 +105,7 @@ async function checkAndCompressMemory(runtime, contextId, model) {
|
|
|
101
105
|
const currentSize = await memoryManager.getSize();
|
|
102
106
|
if (currentSize <= maxChars)
|
|
103
107
|
return;
|
|
104
|
-
await logger.log("info", "
|
|
108
|
+
await logger.log("info", "[agent] compacting memory", {
|
|
105
109
|
contextId,
|
|
106
110
|
currentSize,
|
|
107
111
|
maxChars,
|
|
@@ -109,7 +113,7 @@ async function checkAndCompressMemory(runtime, contextId, model) {
|
|
|
109
113
|
const backupEnabled = config?.backupBeforeCompress ?? true;
|
|
110
114
|
if (backupEnabled) {
|
|
111
115
|
const backupPath = await memoryManager.backup();
|
|
112
|
-
await logger.log("info", "
|
|
116
|
+
await logger.log("info", "[agent] memory backup", {
|
|
113
117
|
contextId,
|
|
114
118
|
backupPath,
|
|
115
119
|
});
|
|
@@ -124,7 +128,7 @@ async function checkAndCompressMemory(runtime, contextId, model) {
|
|
|
124
128
|
model,
|
|
125
129
|
});
|
|
126
130
|
await memoryManager.overwrite(compressed);
|
|
127
|
-
await logger.log("info", "
|
|
131
|
+
await logger.log("info", "[agent] memory compacted", {
|
|
128
132
|
contextId,
|
|
129
133
|
originalSize: currentSize,
|
|
130
134
|
compressedSize: compressed.length,
|
|
@@ -132,7 +136,7 @@ async function checkAndCompressMemory(runtime, contextId, model) {
|
|
|
132
136
|
});
|
|
133
137
|
}
|
|
134
138
|
catch (error) {
|
|
135
|
-
await logger.log("error", "
|
|
139
|
+
await logger.log("error", "[agent] memory compact failed", {
|
|
136
140
|
contextId,
|
|
137
141
|
error: String(error),
|
|
138
142
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../../../src/services/memory/runtime/Service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAC;AAElF,MAAM,cAAc,GAA+B,IAAI,GAAG,EAAE,CAAC;AAE7D,SAAS,gBAAgB,CACvB,OAAuB,EACvB,SAAiB;IAEjB,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAChD,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,MAGjD;IACC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxD,IAAI,CAAC,SAAS;QAAE,OAAO;IAEvB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;IAC/C,MAAM,OAAO,GAAG,MAAM,EAAE,kBAAkB,IAAI,IAAI,CAAC;IACnD,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,MAAM,iBAAiB,GAAG,MAAM,EAAE,iBAAiB,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;QACvC,MAAM,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;QAE5C,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,IAAI,CAAC,CAAC;QAClE,MAAM,gBAAgB,GAAG,YAAY,GAAG,uBAAuB,CAAC;QAEhE,IAAI,gBAAgB,GAAG,iBAAiB;YAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../../../src/services/memory/runtime/Service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAC;AAElF,MAAM,cAAc,GAA+B,IAAI,GAAG,EAAE,CAAC;AAE7D,SAAS,gBAAgB,CACvB,OAAuB,EACvB,SAAiB;IAEjB,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAChD,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,MAGjD;IACC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxD,IAAI,CAAC,SAAS;QAAE,OAAO;IAEvB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;IAC/C,MAAM,OAAO,GAAG,MAAM,EAAE,kBAAkB,IAAI,IAAI,CAAC;IACnD,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,MAAM,iBAAiB,GAAG,MAAM,EAAE,iBAAiB,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;QACvC,MAAM,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;QAE5C,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,IAAI,CAAC,CAAC;QAClE,MAAM,gBAAgB,GAAG,YAAY,GAAG,uBAAuB,CAAC;QAEhE,IAAI,gBAAgB,GAAG,iBAAiB;YAAE,OAAO;QACjD,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,EAAE;YACzD,SAAS;YACT,UAAU,EAAE,CAAC,uBAAuB,EAAE,YAAY,CAAC;SACpD,CAAC,CAAC;QAEH,KAAK,oBAAoB,CAAC;YACxB,OAAO,EAAE,OAAO;YAChB,SAAS;YACT,UAAU,EAAE,uBAAuB;YACnC,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;AACH,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,MAKnC;IACC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACrE,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEnD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,EAAE;YACpD,SAAS;YACT,UAAU,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC;SACnC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QAEpC,MAAM,WAAW,GAAG,MAAM,gCAAgC,CAAC;YACzD,OAAO,EAAE,OAAO;YAChB,SAAS;YACT,UAAU,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC;YAClC,KAAK;SACN,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,MAAM,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAExC,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,aAAa,CAAC,QAAQ,CAAC;YAC3B,uBAAuB,EAAE,QAAQ;YACjC,gBAAgB,EAAE,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,GAAG,CAAC;YAClD,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE;SAC5B,CAAC,CAAC;QAEH,MAAM,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAExD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,EAAE;YACnD,SAAS;YACT,UAAU,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC;SACnC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,EAAE;YACzD,SAAS;YACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,OAAuB,EACvB,SAAiB,EACjB,KAAoB;IAEpB,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEnD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;QAC/C,MAAM,eAAe,GAAG,MAAM,EAAE,kBAAkB,IAAI,IAAI,CAAC;QAC3D,IAAI,CAAC,eAAe;YAAE,OAAO;QAE7B,MAAM,QAAQ,GAAG,MAAM,EAAE,eAAe,IAAI,KAAK,CAAC;QAClD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;QAElD,IAAI,WAAW,IAAI,QAAQ;YAAE,OAAO;QAEpC,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,EAAE;YACpD,SAAS;YACT,WAAW;YACX,QAAQ;SACT,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,MAAM,EAAE,oBAAoB,IAAI,IAAI,CAAC;QAC3D,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC;YAChD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB,EAAE;gBAChD,SAAS;gBACT,UAAU;aACX,CAAC,CAAC;QACL,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC;YACtC,OAAO,EAAE,OAAO;YAChB,SAAS;YACT,cAAc;YACd,WAAW;YACX,KAAK;SACN,CAAC,CAAC;QAEH,MAAM,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE1C,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,EAAE;YACnD,SAAS;YACT,YAAY,EAAE,WAAW;YACzB,cAAc,EAAE,UAAU,CAAC,MAAM;YACjC,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,EAAE;YACzD,SAAS;YACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Action.d.ts","sourceRoot":"","sources":["../../../src/services/task/Action.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"Action.d.ts","sourceRoot":"","sources":["../../../src/services/task/Action.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAmBvE,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AA0BhC,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8B5B;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAmF9B;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0K9B;AAED,wBAAsB,iBAAiB,CAAC,MAAM,EAAE;IAC9C,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,eAAe,CAAC,CA6E3B;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,oBAAoB,CAAC;CAC/B,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAwCjC;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAoB9B"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
import path from "node:path";
|
|
9
9
|
import { nanoid } from "nanoid";
|
|
10
10
|
import { isValidTaskId, normalizeTaskId, } from "./runtime/Paths.js";
|
|
11
|
-
import { normalizeMaxDialogueRounds, normalizeMinOutputChars, normalizeRequiredArtifacts, normalizeTaskKind, normalizeTaskTime, normalizeTaskStatus, } from "./runtime/Model.js";
|
|
11
|
+
import { normalizeTaskCron, normalizeMaxDialogueRounds, normalizeMinOutputChars, normalizeRequiredArtifacts, normalizeTaskKind, normalizeTaskTime, normalizeTaskTimezone, normalizeTaskStatus, validateTaskScheduleCombination, } from "./runtime/Model.js";
|
|
12
12
|
import { deleteTask, listTasks, readTask, writeTask } from "./runtime/Store.js";
|
|
13
13
|
import { runTaskNow } from "./runtime/Runner.js";
|
|
14
14
|
function resolveTaskStatus(input, fallback) {
|
|
@@ -69,20 +69,31 @@ export async function createTaskDefinition(params) {
|
|
|
69
69
|
: `task-${nanoid(10)}`;
|
|
70
70
|
const title = String(req.title || "").trim();
|
|
71
71
|
const description = String(req.description || "").trim();
|
|
72
|
-
const
|
|
72
|
+
const cronNormalized = normalizeTaskCron(String(req.cron || "@manual").trim() || "@manual");
|
|
73
73
|
const contextId = String(req.contextId || "").trim();
|
|
74
74
|
const kind = normalizeTaskKind(req.kind);
|
|
75
75
|
const timeNormalized = normalizeTaskTime(req.time);
|
|
76
|
+
const timezoneNormalized = normalizeTaskTimezone(req.timezone);
|
|
76
77
|
if (!title)
|
|
77
78
|
return { success: false, error: "Missing title" };
|
|
78
79
|
if (!description)
|
|
79
80
|
return { success: false, error: "Missing description" };
|
|
80
81
|
if (!contextId)
|
|
81
82
|
return { success: false, error: "Missing contextId" };
|
|
83
|
+
if (!cronNormalized.ok)
|
|
84
|
+
return { success: false, error: cronNormalized.error };
|
|
82
85
|
if (!timeNormalized.ok)
|
|
83
86
|
return { success: false, error: timeNormalized.error };
|
|
87
|
+
if (!timezoneNormalized.ok)
|
|
88
|
+
return { success: false, error: timezoneNormalized.error };
|
|
89
|
+
const scheduleCombination = validateTaskScheduleCombination({
|
|
90
|
+
cron: cronNormalized.value,
|
|
91
|
+
time: timeNormalized.value,
|
|
92
|
+
});
|
|
93
|
+
if (!scheduleCombination.ok) {
|
|
94
|
+
return { success: false, error: scheduleCombination.error };
|
|
95
|
+
}
|
|
84
96
|
const status = resolveTaskStatus(req.status, "paused");
|
|
85
|
-
const timezone = typeof req.timezone === "string" ? req.timezone.trim() : "";
|
|
86
97
|
const body = typeof req.body === "string" && req.body.trim()
|
|
87
98
|
? req.body.trim()
|
|
88
99
|
: kind === "script"
|
|
@@ -105,12 +116,12 @@ export async function createTaskDefinition(params) {
|
|
|
105
116
|
frontmatter: {
|
|
106
117
|
title,
|
|
107
118
|
description,
|
|
108
|
-
cron,
|
|
119
|
+
cron: cronNormalized.value,
|
|
109
120
|
contextId,
|
|
110
121
|
kind,
|
|
111
122
|
...(timeNormalized.value ? { time: timeNormalized.value } : {}),
|
|
112
123
|
status,
|
|
113
|
-
...(
|
|
124
|
+
...(timezoneNormalized.value ? { timezone: timezoneNormalized.value } : {}),
|
|
114
125
|
...(requiredArtifactsNormalized.value.length > 0
|
|
115
126
|
? { requiredArtifacts: requiredArtifactsNormalized.value }
|
|
116
127
|
: {}),
|
|
@@ -172,9 +183,10 @@ export async function updateTaskDefinition(params) {
|
|
|
172
183
|
: current.frontmatter.description;
|
|
173
184
|
if (!description)
|
|
174
185
|
return { success: false, error: "description cannot be empty" };
|
|
175
|
-
const
|
|
176
|
-
|
|
177
|
-
|
|
186
|
+
const cronInput = typeof req.cron === "string" ? req.cron.trim() : current.frontmatter.cron;
|
|
187
|
+
const cronNormalized = normalizeTaskCron(cronInput);
|
|
188
|
+
if (!cronNormalized.ok)
|
|
189
|
+
return { success: false, error: cronNormalized.error };
|
|
178
190
|
const contextId = typeof req.contextId === "string" ? req.contextId.trim() : current.frontmatter.contextId;
|
|
179
191
|
if (!contextId)
|
|
180
192
|
return { success: false, error: "contextId cannot be empty" };
|
|
@@ -196,9 +208,9 @@ export async function updateTaskDefinition(params) {
|
|
|
196
208
|
error: `Invalid status: ${String(req.status)}`,
|
|
197
209
|
};
|
|
198
210
|
}
|
|
199
|
-
let
|
|
211
|
+
let timezoneInput;
|
|
200
212
|
if (req.clearTimezone) {
|
|
201
|
-
|
|
213
|
+
timezoneInput = undefined;
|
|
202
214
|
}
|
|
203
215
|
else if (typeof req.timezone === "string") {
|
|
204
216
|
const t = req.timezone.trim();
|
|
@@ -208,10 +220,21 @@ export async function updateTaskDefinition(params) {
|
|
|
208
220
|
error: "timezone cannot be empty (use clearTimezone to unset)",
|
|
209
221
|
};
|
|
210
222
|
}
|
|
211
|
-
|
|
223
|
+
timezoneInput = t;
|
|
212
224
|
}
|
|
213
225
|
else {
|
|
214
|
-
|
|
226
|
+
timezoneInput = current.frontmatter.timezone;
|
|
227
|
+
}
|
|
228
|
+
const timezoneNormalized = normalizeTaskTimezone(timezoneInput);
|
|
229
|
+
if (!timezoneNormalized.ok) {
|
|
230
|
+
return { success: false, error: timezoneNormalized.error };
|
|
231
|
+
}
|
|
232
|
+
const scheduleCombination = validateTaskScheduleCombination({
|
|
233
|
+
cron: cronNormalized.value,
|
|
234
|
+
time: timeNormalized.value,
|
|
235
|
+
});
|
|
236
|
+
if (!scheduleCombination.ok) {
|
|
237
|
+
return { success: false, error: scheduleCombination.error };
|
|
215
238
|
}
|
|
216
239
|
let requiredArtifacts = [];
|
|
217
240
|
if (req.clearRequiredArtifacts) {
|
|
@@ -266,12 +289,12 @@ export async function updateTaskDefinition(params) {
|
|
|
266
289
|
frontmatter: {
|
|
267
290
|
title,
|
|
268
291
|
description,
|
|
269
|
-
cron,
|
|
292
|
+
cron: cronNormalized.value,
|
|
270
293
|
contextId,
|
|
271
294
|
kind,
|
|
272
295
|
...(timeNormalized.value ? { time: timeNormalized.value } : {}),
|
|
273
296
|
status,
|
|
274
|
-
...(
|
|
297
|
+
...(timezoneNormalized.value ? { timezone: timezoneNormalized.value } : {}),
|
|
275
298
|
...(requiredArtifacts.length > 0 ? { requiredArtifacts } : {}),
|
|
276
299
|
...(typeof minOutputChars === "number" ? { minOutputChars } : {}),
|
|
277
300
|
...(typeof maxDialogueRounds === "number" ? { maxDialogueRounds } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Action.js","sourceRoot":"","sources":["../../../src/services/task/Action.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EACL,aAAa,EACb,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,0BAA0B,EAC1B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAejD,SAAS,iBAAiB,CAAC,KAA4B,EAAE,QAAwB;IAC/E,MAAM,UAAU,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC9C,OAAO,UAAU,IAAI,QAAQ,CAAC;AAChC,CAAC;AAED,MAAM,eAAe,GAAG,QAAQ,CAAC;AAEjC,SAAS,oBAAoB,CAAC,OAAe;IAC3C,OAAO,GAAG,eAAe,IAAI,OAAO,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO;QACL,QAAQ;QACR,EAAE;QACF,iEAAiE;QACjE,EAAE;QACF,MAAM;QACN,EAAE;QACF,4EAA4E;QAC5E,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAGzC;IACC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAE5D,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,gBAAgB;QAC/B,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,gBAAgB,CAAC;QAChF,CAAC,CAAC,KAAK,CAAC;IAEV,OAAO;QACL,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,OAAO;YAC1B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC;gBAC5E,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAC/C,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,IAAI,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3F,GAAG,CAAC,OAAO,IAAI,CAAC,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpG,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9E,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAG1C;IACC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;IAE3B,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,MAAM,MAAM,GAAG,SAAS,IAAI,aAAa,CAAC,SAAS,CAAC;QAClD,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC;QAC5B,CAAC,CAAC,QAAQ,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;IAEzB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACzD,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;IAC/D,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;IAC9D,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC1E,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;IACtE,IAAI,CAAC,cAAc,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC;IAE/E,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,MAAM,IAAI,GACR,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;QAC7C,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;QACjB,CAAC,CAAC,IAAI,KAAK,QAAQ;YACjB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,oBAAoB,EAAE,CAAC;IAC/B,MAAM,2BAA2B,GAAG,0BAA0B,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACtF,IAAI,CAAC,2BAA2B,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,CAAC,KAAK,EAAE,CAAC;IACzG,MAAM,wBAAwB,GAAG,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC7E,IAAI,CAAC,wBAAwB,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,wBAAwB,CAAC,KAAK,EAAE,CAAC;IACnG,MAAM,2BAA2B,GAAG,0BAA0B,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACtF,IAAI,CAAC,2BAA2B,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,CAAC,KAAK,EAAE,CAAC;IAEzG,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC;YAC9B,MAAM;YACN,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;YACjC,WAAW,EAAE;gBACX,KAAK;gBACL,WAAW;gBACX,IAAI;gBACJ,SAAS;gBACT,IAAI;gBACJ,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/D,MAAM;gBACN,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjC,GAAG,CAAC,2BAA2B,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;oBAC9C,CAAC,CAAC,EAAE,iBAAiB,EAAE,2BAA2B,CAAC,KAAK,EAAE;oBAC1D,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,OAAO,wBAAwB,CAAC,KAAK,KAAK,QAAQ;oBACpD,CAAC,CAAC,EAAE,cAAc,EAAE,wBAAwB,CAAC,KAAK,EAAE;oBACpD,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,OAAO,2BAA2B,CAAC,KAAK,KAAK,QAAQ;oBACvD,CAAC,CAAC,EAAE,iBAAiB,EAAE,2BAA2B,CAAC,KAAK,EAAE;oBAC1D,CAAC,CAAC,EAAE,CAAC;aACR;YACD,IAAI;SACL,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAG1C;IACC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;IAC3B,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhE,0CAA0C;IAC1C,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACpD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2CAA2C,EAAE,CAAC;IAChF,CAAC;IACD,IAAI,GAAG,CAAC,iBAAiB,KAAK,SAAS,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,6DAA6D,EAAE,CAAC;IAClG,CAAC;IACD,IAAI,GAAG,CAAC,cAAc,KAAK,SAAS,IAAI,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAChE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,uDAAuD,EAAE,CAAC;IAC5F,CAAC;IACD,IAAI,GAAG,CAAC,iBAAiB,KAAK,SAAS,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,6DAA6D,EAAE,CAAC;IAClG,CAAC;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;QAC5C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,mCAAmC,EAAE,CAAC;IACxE,CAAC;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;QAC5C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,mCAAmC,EAAE,CAAC;IACxE,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC;YAC7B,WAAW,EAAE,IAAI;YACjB,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,KAAK,GACT,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;QAC/E,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;QAEtE,MAAM,WAAW,GACf,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ;YACjC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE;YACxB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,WAAW;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAC;QAElF,MAAM,IAAI,GACR,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;QAC5E,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC;QAEpE,MAAM,SAAS,GACb,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC;QAC3F,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC;QAC9E,MAAM,IAAI,GAAG,iBAAiB,CAC5B,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAC7D,CAAC;QACF,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS;gBACtB,CAAC,CAAC,GAAG,CAAC,IAAI;gBACV,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;QAC/B,MAAM,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,EAAE;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC;QAE/E,MAAM,MAAM,GACV,GAAG,CAAC,MAAM,KAAK,SAAS;YACtB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM;YAC5B,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;aAC/C,CAAC;QACJ,CAAC;QAED,IAAI,QAA4B,CAAC;QACjC,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;YACtB,QAAQ,GAAG,SAAS,CAAC;QACvB,CAAC;aAAM,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,CAAC,EAAE,CAAC;gBACP,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,uDAAuD;iBAC/D,CAAC;YACJ,CAAC;YACD,QAAQ,GAAG,CAAC,CAAC;QACf,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC;QAC1C,CAAC;QAED,IAAI,iBAAiB,GAAa,EAAE,CAAC;QACrC,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC;YAC/B,iBAAiB,GAAG,EAAE,CAAC;QACzB,CAAC;aAAM,IAAI,GAAG,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,0BAA0B,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACrE,IAAI,CAAC,UAAU,CAAC,EAAE;gBAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC;YACvE,iBAAiB,GAAG,UAAU,CAAC,KAAK,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC;gBACtE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB;gBACvC,CAAC,CAAC,EAAE,CAAC;QACT,CAAC;QAED,IAAI,cAAkC,CAAC;QACvC,IAAI,GAAG,CAAC,mBAAmB,EAAE,CAAC;YAC5B,cAAc,GAAG,SAAS,CAAC;QAC7B,CAAC;aAAM,IAAI,GAAG,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YAC5C,MAAM,UAAU,GAAG,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC/D,IAAI,CAAC,UAAU,CAAC,EAAE;gBAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC;YACvE,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;QACtD,CAAC;QAED,IAAI,iBAAqC,CAAC;QAC1C,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC;YAC/B,iBAAiB,GAAG,SAAS,CAAC;QAChC,CAAC;aAAM,IAAI,GAAG,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,0BAA0B,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACrE,IAAI,CAAC,UAAU,CAAC,EAAE;gBAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC;YACvE,iBAAiB,GAAG,UAAU,CAAC,KAAK,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC;QAC5D,CAAC;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS;YACxB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAC5B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;gBACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;QAEnB,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC;YAC9B,WAAW,EAAE,IAAI;YACjB,MAAM;YACN,SAAS,EAAE,IAAI;YACf,WAAW,EAAE;gBACX,KAAK;gBACL,WAAW;gBACX,IAAI;gBACJ,SAAS;gBACT,IAAI;gBACJ,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/D,MAAM;gBACN,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjC,GAAG,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9D,GAAG,CAAC,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjE,GAAG,CAAC,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACxE;YACD,IAAI;SACL,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAIvC;IACC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,MAAM,OAAO,GAAG;QACd,IAAI,EAAE,QAAiB;QACvB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9B,CAAC;IAEF,IAAI,CAAC;QACH,sCAAsC;QACtC,MAAM,QAAQ,CAAC;YACb,MAAM;YACN,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CACxB,oBAAoB,CAAC,0BAA0B,CAAC,EAChD;YACE,MAAM;YACN,GAAG,EAAE,QAAQ;YACb,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9B,CACF,CAAC;QAEF,KAAK,UAAU,CAAC;YACd,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW,EAAE,IAAI;YACjB,MAAM;YACN,OAAO;SACR,CAAC;aACC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CACxB,oBAAoB,CAAC,0BAA0B,CAAC,EAChD;gBACE,MAAM;gBACN,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,eAAe,EAAE,MAAM,CAAC,eAAe;gBACvC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;oBAChC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE;oBACvC,CAAC,CAAC,EAAE,CAAC;gBACP,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;gBACrD,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,MAAM,EAAE,MAAM,CAAC,SAAS;gBACxB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,GAAG,CAAC,MAAM,CAAC,WAAW;oBACpB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;oBACrC,CAAC,CAAC,EAAE,CAAC;aACR,CACF,CAAC;QACJ,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACzB,oBAAoB,CAAC,wBAAwB,CAAC,EAC9C;gBACE,MAAM;gBACN,GAAG,EAAE,QAAQ;gBACb,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;aACrB,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,OAAO;YACL,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,UAAU;YACnB,MAAM;SACP,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAGnC;IACC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,mBAAmB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;SAC1D,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC;YAC1B,WAAW,EAAE,IAAI;YACjB,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,SAAS,CAAC;YACd,WAAW,EAAE,IAAI;YACjB,MAAM;YACN,SAAS,EAAE,IAAI;YACf,WAAW,EAAE;gBACX,GAAG,IAAI,CAAC,WAAW;gBACnB,MAAM;aACP;YACD,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM;YACN,MAAM;SACP,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAG1C;IACC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAE3E,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC;YAC/B,WAAW,EAAE,IAAI;YACjB,MAAM;SACP,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"Action.js","sourceRoot":"","sources":["../../../src/services/task/Action.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Index.d.ts","sourceRoot":"","sources":["../../../src/services/task/Index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"Index.d.ts","sourceRoot":"","sources":["../../../src/services/task/Index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAikB/D,eAAO,MAAM,WAAW,EAAE,OAodzB,CAAC"}
|
|
@@ -136,6 +136,41 @@ function resolveContextIdOrThrow(input) {
|
|
|
136
136
|
}
|
|
137
137
|
return contextId;
|
|
138
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* 任务定义变更后重载 scheduler。
|
|
141
|
+
*
|
|
142
|
+
* 关键点(中文)
|
|
143
|
+
* - 解决“create/update 后还沿用旧注册表”的时序问题。
|
|
144
|
+
* - 重载失败不阻断主操作(任务定义已经写入成功),仅记录 warning 供排查。
|
|
145
|
+
*/
|
|
146
|
+
async function reloadTaskSchedulerAfterMutation(params) {
|
|
147
|
+
try {
|
|
148
|
+
const result = await restartTaskCronRuntime(params.context);
|
|
149
|
+
params.context.logger.info(formatTaskLogMessage("Task scheduler reloaded after mutation"), {
|
|
150
|
+
action: params.action,
|
|
151
|
+
taskId: params.taskId,
|
|
152
|
+
tasksFound: result.tasksFound,
|
|
153
|
+
jobsScheduled: result.jobsScheduled,
|
|
154
|
+
});
|
|
155
|
+
return {
|
|
156
|
+
reloaded: true,
|
|
157
|
+
tasksFound: result.tasksFound,
|
|
158
|
+
jobsScheduled: result.jobsScheduled,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
catch (error) {
|
|
162
|
+
const reason = String(error);
|
|
163
|
+
params.context.logger.warn(formatTaskLogMessage("Task scheduler reload failed after mutation"), {
|
|
164
|
+
action: params.action,
|
|
165
|
+
taskId: params.taskId,
|
|
166
|
+
error: reason,
|
|
167
|
+
});
|
|
168
|
+
return {
|
|
169
|
+
reloaded: false,
|
|
170
|
+
error: reason,
|
|
171
|
+
};
|
|
172
|
+
}
|
|
173
|
+
}
|
|
139
174
|
function mapTaskListCommandInput(opts) {
|
|
140
175
|
const status = readTaskStatusOrThrow(getStringOpt(opts, "status"));
|
|
141
176
|
return status ? { status } : {};
|
|
@@ -150,7 +185,12 @@ function mapTaskCreateCommandInput(opts) {
|
|
|
150
185
|
const contextId = resolveContextIdOrThrow(getStringOpt(opts, "contextId"));
|
|
151
186
|
const kind = readTaskKindOrThrow(getStringOpt(opts, "kind"));
|
|
152
187
|
const status = readTaskStatusOrThrow(getStringOpt(opts, "status"));
|
|
188
|
+
const activate = getBooleanOpt(opts, "activate") === true;
|
|
189
|
+
if (activate && status && status !== "enabled") {
|
|
190
|
+
throw new Error("`--activate` conflicts with `--status` unless status=enabled");
|
|
191
|
+
}
|
|
153
192
|
const requiredArtifacts = getStringArrayOpt(opts, "requiredArtifact");
|
|
193
|
+
const resolvedStatus = activate ? "enabled" : status;
|
|
154
194
|
return {
|
|
155
195
|
...(getStringOpt(opts, "taskId")
|
|
156
196
|
? { taskId: getStringOpt(opts, "taskId") }
|
|
@@ -163,7 +203,7 @@ function mapTaskCreateCommandInput(opts) {
|
|
|
163
203
|
...(typeof getStringOpt(opts, "time") === "string"
|
|
164
204
|
? { time: getStringOpt(opts, "time") }
|
|
165
205
|
: {}),
|
|
166
|
-
...(
|
|
206
|
+
...(resolvedStatus ? { status: resolvedStatus } : {}),
|
|
167
207
|
...(getStringOpt(opts, "timezone")
|
|
168
208
|
? { timezone: getStringOpt(opts, "timezone") }
|
|
169
209
|
: {}),
|
|
@@ -186,6 +226,7 @@ function mapTaskUpdateCommandInput(params) {
|
|
|
186
226
|
const opts = params.opts;
|
|
187
227
|
const kind = readTaskKindOrThrow(getStringOpt(opts, "kind"));
|
|
188
228
|
const status = readTaskStatusOrThrow(getStringOpt(opts, "status"));
|
|
229
|
+
const activate = getBooleanOpt(opts, "activate") === true;
|
|
189
230
|
const requiredArtifacts = getStringArrayOpt(opts, "requiredArtifact");
|
|
190
231
|
// 关键点(中文):set 与 clear 选项互斥,提前在命令入口做校验。
|
|
191
232
|
const conflicts = [];
|
|
@@ -214,9 +255,13 @@ function mapTaskUpdateCommandInput(params) {
|
|
|
214
255
|
getBooleanOpt(opts, "clearTime")) {
|
|
215
256
|
conflicts.push("`--time` conflicts with `--clear-time`");
|
|
216
257
|
}
|
|
258
|
+
if (activate && status && status !== "enabled") {
|
|
259
|
+
conflicts.push("`--activate` conflicts with `--status` unless status=enabled");
|
|
260
|
+
}
|
|
217
261
|
if (conflicts.length > 0) {
|
|
218
262
|
throw new Error(conflicts.join("; "));
|
|
219
263
|
}
|
|
264
|
+
const resolvedStatus = activate ? "enabled" : status;
|
|
220
265
|
const hasUpdate = typeof getStringOpt(opts, "title") === "string" ||
|
|
221
266
|
typeof getStringOpt(opts, "cron") === "string" ||
|
|
222
267
|
typeof getStringOpt(opts, "description") === "string" ||
|
|
@@ -224,7 +269,7 @@ function mapTaskUpdateCommandInput(params) {
|
|
|
224
269
|
typeof kind === "string" ||
|
|
225
270
|
typeof getStringOpt(opts, "time") === "string" ||
|
|
226
271
|
getBooleanOpt(opts, "clearTime") === true ||
|
|
227
|
-
typeof
|
|
272
|
+
typeof resolvedStatus === "string" ||
|
|
228
273
|
typeof getStringOpt(opts, "timezone") === "string" ||
|
|
229
274
|
getBooleanOpt(opts, "clearTimezone") === true ||
|
|
230
275
|
(Array.isArray(requiredArtifacts) && requiredArtifacts.length > 0) ||
|
|
@@ -257,7 +302,7 @@ function mapTaskUpdateCommandInput(params) {
|
|
|
257
302
|
? { time: getStringOpt(opts, "time") }
|
|
258
303
|
: {}),
|
|
259
304
|
...(getBooleanOpt(opts, "clearTime") ? { clearTime: true } : {}),
|
|
260
|
-
...(typeof
|
|
305
|
+
...(typeof resolvedStatus === "string" ? { status: resolvedStatus } : {}),
|
|
261
306
|
...(typeof getStringOpt(opts, "timezone") === "string"
|
|
262
307
|
? { timezone: getStringOpt(opts, "timezone") }
|
|
263
308
|
: {}),
|
|
@@ -301,6 +346,12 @@ function mapTaskListApiInput(query) {
|
|
|
301
346
|
return status ? { status } : {};
|
|
302
347
|
}
|
|
303
348
|
function mapTaskCreateApiInput(body) {
|
|
349
|
+
const status = getOptionalTaskStatusField(body, "status");
|
|
350
|
+
const activate = getBooleanField(body, "activate");
|
|
351
|
+
if (activate && status && status !== "enabled") {
|
|
352
|
+
throw new Error("`activate` conflicts with `status` unless status=enabled");
|
|
353
|
+
}
|
|
354
|
+
const resolvedStatus = activate ? "enabled" : status;
|
|
304
355
|
return {
|
|
305
356
|
taskId: getOptionalStringField(body, "taskId"),
|
|
306
357
|
title: getStringField(body, "title"),
|
|
@@ -309,7 +360,7 @@ function mapTaskCreateApiInput(body) {
|
|
|
309
360
|
contextId: getStringField(body, "contextId"),
|
|
310
361
|
kind: getOptionalTaskKindField(body, "kind"),
|
|
311
362
|
time: getOptionalStringField(body, "time"),
|
|
312
|
-
status:
|
|
363
|
+
status: resolvedStatus,
|
|
313
364
|
timezone: getOptionalStringField(body, "timezone"),
|
|
314
365
|
body: getOptionalStringField(body, "body"),
|
|
315
366
|
requiredArtifacts: getOptionalStringArrayField(body, "requiredArtifacts"),
|
|
@@ -327,6 +378,12 @@ function mapTaskRunApiInput(body) {
|
|
|
327
378
|
};
|
|
328
379
|
}
|
|
329
380
|
function mapTaskUpdateApiInput(body) {
|
|
381
|
+
const status = getOptionalTaskStatusField(body, "status");
|
|
382
|
+
const activate = getBooleanField(body, "activate");
|
|
383
|
+
if (activate && status && status !== "enabled") {
|
|
384
|
+
throw new Error("`activate` conflicts with `status` unless status=enabled");
|
|
385
|
+
}
|
|
386
|
+
const resolvedStatus = activate ? "enabled" : status;
|
|
330
387
|
return {
|
|
331
388
|
taskId: getStringField(body, "taskId"),
|
|
332
389
|
...(getOptionalStringField(body, "title")
|
|
@@ -348,9 +405,7 @@ function mapTaskUpdateApiInput(body) {
|
|
|
348
405
|
? { time: getOptionalStringField(body, "time") }
|
|
349
406
|
: {}),
|
|
350
407
|
...(getBooleanField(body, "clearTime") ? { clearTime: true } : {}),
|
|
351
|
-
...(
|
|
352
|
-
? { status: getOptionalTaskStatusField(body, "status") }
|
|
353
|
-
: {}),
|
|
408
|
+
...(resolvedStatus ? { status: resolvedStatus } : {}),
|
|
354
409
|
...(getOptionalStringField(body, "timezone")
|
|
355
410
|
? { timezone: getOptionalStringField(body, "timezone") }
|
|
356
411
|
: {}),
|
|
@@ -444,9 +499,10 @@ export const taskService = {
|
|
|
444
499
|
.option("--task-id <taskId>", "任务 ID(不传则自动生成)")
|
|
445
500
|
.option("--cron <cron>", "cron 表达式(默认 @manual)", "@manual")
|
|
446
501
|
.option("--kind <kind>", "执行类型(agent|script)", "agent")
|
|
447
|
-
.option("--time <time>", "单次计划时间(ISO8601
|
|
502
|
+
.option("--time <time>", "单次计划时间(ISO8601 且必须含时区;启用 time 时请配合 --cron @manual)")
|
|
448
503
|
.option("--context-id <contextId>", "通知目标 contextId(不传尝试使用 SMA_CTX_CONTEXT_ID)")
|
|
449
|
-
.option("--status <status>", "状态(enabled|paused|disabled
|
|
504
|
+
.option("--status <status>", "状态(enabled|paused|disabled,默认 paused)")
|
|
505
|
+
.option("--activate", "创建后立即启用(等同 --status enabled)", false)
|
|
450
506
|
.option("--timezone <timezone>", "IANA 时区")
|
|
451
507
|
.option("--required-artifact <path>", "要求 run 目录必须产出的相对路径文件(可重复)", collectStringOption, [])
|
|
452
508
|
.option("--min-output-chars <n>", "最小输出字符数(默认 1)", parseNonNegativeIntOption)
|
|
@@ -477,9 +533,17 @@ export const taskService = {
|
|
|
477
533
|
error: result.error || "task create failed",
|
|
478
534
|
};
|
|
479
535
|
}
|
|
536
|
+
const scheduler = await reloadTaskSchedulerAfterMutation({
|
|
537
|
+
context: params.context,
|
|
538
|
+
action: "create",
|
|
539
|
+
taskId: String(result.taskId || "").trim() || "unknown",
|
|
540
|
+
});
|
|
480
541
|
return {
|
|
481
542
|
success: true,
|
|
482
|
-
data:
|
|
543
|
+
data: {
|
|
544
|
+
...result,
|
|
545
|
+
scheduler,
|
|
546
|
+
},
|
|
483
547
|
};
|
|
484
548
|
},
|
|
485
549
|
},
|
|
@@ -557,9 +621,17 @@ export const taskService = {
|
|
|
557
621
|
error: result.error || "task delete failed",
|
|
558
622
|
};
|
|
559
623
|
}
|
|
624
|
+
const scheduler = await reloadTaskSchedulerAfterMutation({
|
|
625
|
+
context: params.context,
|
|
626
|
+
action: "delete",
|
|
627
|
+
taskId: String(result.taskId || payload.taskId || "").trim() || "unknown",
|
|
628
|
+
});
|
|
560
629
|
return {
|
|
561
630
|
success: true,
|
|
562
|
-
data:
|
|
631
|
+
data: {
|
|
632
|
+
...result,
|
|
633
|
+
scheduler,
|
|
634
|
+
},
|
|
563
635
|
};
|
|
564
636
|
},
|
|
565
637
|
},
|
|
@@ -573,10 +645,11 @@ export const taskService = {
|
|
|
573
645
|
.option("--description <description>", "任务描述")
|
|
574
646
|
.option("--cron <cron>", "cron 表达式")
|
|
575
647
|
.option("--kind <kind>", "执行类型(agent|script)")
|
|
576
|
-
.option("--time <time>", "单次计划时间(ISO8601)")
|
|
648
|
+
.option("--time <time>", "单次计划时间(ISO8601 且必须含时区;启用 time 时请配合 cron=@manual)")
|
|
577
649
|
.option("--clear-time", "清空 time", false)
|
|
578
650
|
.option("--context-id <contextId>", "通知目标 contextId")
|
|
579
651
|
.option("--status <status>", "状态(enabled|paused|disabled)")
|
|
652
|
+
.option("--activate", "更新后立即启用(等同 --status enabled)", false)
|
|
580
653
|
.option("--timezone <timezone>", "IANA 时区")
|
|
581
654
|
.option("--clear-timezone", "清空 timezone", false)
|
|
582
655
|
.option("--required-artifact <path>", "设置 requiredArtifacts(可重复;与 --clear-required-artifacts 互斥)", collectStringOption)
|
|
@@ -617,9 +690,17 @@ export const taskService = {
|
|
|
617
690
|
error: result.error || "task update failed",
|
|
618
691
|
};
|
|
619
692
|
}
|
|
693
|
+
const scheduler = await reloadTaskSchedulerAfterMutation({
|
|
694
|
+
context: params.context,
|
|
695
|
+
action: "update",
|
|
696
|
+
taskId: String(result.taskId || payload.taskId || "").trim() || "unknown",
|
|
697
|
+
});
|
|
620
698
|
return {
|
|
621
699
|
success: true,
|
|
622
|
-
data:
|
|
700
|
+
data: {
|
|
701
|
+
...result,
|
|
702
|
+
scheduler,
|
|
703
|
+
},
|
|
623
704
|
};
|
|
624
705
|
},
|
|
625
706
|
},
|
|
@@ -661,9 +742,17 @@ export const taskService = {
|
|
|
661
742
|
error: result.error || "task status update failed",
|
|
662
743
|
};
|
|
663
744
|
}
|
|
745
|
+
const scheduler = await reloadTaskSchedulerAfterMutation({
|
|
746
|
+
context: params.context,
|
|
747
|
+
action: "status",
|
|
748
|
+
taskId: String(result.taskId || payload.taskId || "").trim() || "unknown",
|
|
749
|
+
});
|
|
664
750
|
return {
|
|
665
751
|
success: true,
|
|
666
|
-
data:
|
|
752
|
+
data: {
|
|
753
|
+
...result,
|
|
754
|
+
scheduler,
|
|
755
|
+
},
|
|
667
756
|
};
|
|
668
757
|
},
|
|
669
758
|
},
|
|
@@ -695,9 +784,17 @@ export const taskService = {
|
|
|
695
784
|
error: result.error || "task enable failed",
|
|
696
785
|
};
|
|
697
786
|
}
|
|
787
|
+
const scheduler = await reloadTaskSchedulerAfterMutation({
|
|
788
|
+
context: params.context,
|
|
789
|
+
action: "status",
|
|
790
|
+
taskId: String(result.taskId || payload.taskId || "").trim() || "unknown",
|
|
791
|
+
});
|
|
698
792
|
return {
|
|
699
793
|
success: true,
|
|
700
|
-
data:
|
|
794
|
+
data: {
|
|
795
|
+
...result,
|
|
796
|
+
scheduler,
|
|
797
|
+
},
|
|
701
798
|
};
|
|
702
799
|
},
|
|
703
800
|
},
|
|
@@ -729,9 +826,17 @@ export const taskService = {
|
|
|
729
826
|
error: result.error || "task disable failed",
|
|
730
827
|
};
|
|
731
828
|
}
|
|
829
|
+
const scheduler = await reloadTaskSchedulerAfterMutation({
|
|
830
|
+
context: params.context,
|
|
831
|
+
action: "status",
|
|
832
|
+
taskId: String(result.taskId || payload.taskId || "").trim() || "unknown",
|
|
833
|
+
});
|
|
732
834
|
return {
|
|
733
835
|
success: true,
|
|
734
|
-
data:
|
|
836
|
+
data: {
|
|
837
|
+
...result,
|
|
838
|
+
scheduler,
|
|
839
|
+
},
|
|
735
840
|
};
|
|
736
841
|
},
|
|
737
842
|
},
|