evolcore 0.0.2 → 0.0.4

package/dist/trigger/parser.js

@@ -5,6 +5,14 @@ const TRIGGER_UPDATE_FLAGS = new Set([
     'model', 'effort', 'permission',
     'max-runs', 'max-duration', 'concurrency', 'missed-policy',
 ]);
+const TRIGGER_CREATE_FLAGS = new Set([
+    'once', 'delay', 'at', 'cron', 'every', 'event', 'tz',
+    'exec', 'prompt', 'name', 'agent',
+    'script-path', 'script-runtime', 'script-args', 'script-timeout',
+    'feedback', 'target-channel', 'target-channel-id', 'target-session', 'target-thread-id',
+    'trigger-thread', 'baseagent',
+    'model', 'effort', 'permission', 'max-runs', 'max-duration',
+]);
 // Note: unquoted multi-word values (e.g. --prompt=hello world) are not supported.
 // The second word would be treated as an unknown token. Always quote multi-word values:
 //   --prompt "hello world"  or  --prompt='hello world'
@@ -19,6 +27,34 @@ function parseFlags(args) {
     }
     return flags;
 }
+function promptSyntaxError(args) {
+    const match = /--prompt(?:\s+|=|$)/.exec(args);
+    if (!match)
+        return undefined;
+    const rest = args.slice((match.index ?? 0) + match[0].length).trimStart();
+    const quote = rest[0];
+    if (quote !== '"' && quote !== "'")
+        return undefined;
+    for (let index = 1; index < rest.length; index++) {
+        if (rest[index] === '\\') {
+            index += 1;
+            continue;
+        }
+        if (rest[index] === quote)
+            return undefined;
+    }
+    return '--prompt 引号未闭合；复杂内容建议改用 --prompt-file <path>';
+}
+function inlinePromptPresent(args) {
+    if (Array.isArray(args))
+        return args.some(arg => arg === '--prompt' || arg.startsWith('--prompt='));
+    return /--prompt(?:\s+|=|$)/.test(args);
+}
+function withPromptFileHint(error, args, opts = {}) {
+    if (!inlinePromptPresent(args) || opts.allowLongPrompt || error.includes('--prompt-file'))
+        return error;
+    return `${error}；复杂内容建议改用 --prompt-file <path>`;
+}
 export function parseDuration(s) {
     const m = /^([1-9]\d*)([dhms])$/.exec(s.trim().toLowerCase());
     if (!m)
@@ -103,6 +139,14 @@ function parseModelFlag(flags) {
         return { ok: false, error: '--model 不能为空' };
     return { ok: true, value: raw };
 }
+function parseBaseagentFlag(flags) {
+    if (!flags.has('baseagent'))
+        return { ok: true };
+    const raw = flags.get('baseagent');
+    if (!raw || raw === true || !raw.trim())
+        return { ok: false, error: '--baseagent 不能为空' };
+    return { ok: true, value: raw.trim() };
+}
 function parseEffortFlag(flags) {
     if (!flags.has('effort'))
         return { ok: true };
@@ -251,6 +295,12 @@ function commonParsed(flags, opts = {}) {
     const deprecated = rejectDeprecatedFlags(flags);
     if (deprecated)
         return { ok: false, error: deprecated };
+    if (!opts.update) {
+        for (const flag of flags.keys()) {
+            if (!TRIGGER_CREATE_FLAGS.has(flag))
+                return { ok: false, error: `create 不支持参数 --${flag}` };
+        }
+    }
     const source = parseSourceFlags(flags, opts);
     if (!source.ok)
         return source;
@@ -281,6 +331,9 @@ function commonParsed(flags, opts = {}) {
     const model = parseModelFlag(flags);
     if (!model.ok)
         return model;
+    const baseagent = parseBaseagentFlag(flags);
+    if (!baseagent.ok)
+        return baseagent;
     const effort = parseEffortFlag(flags);
     if (!effort.ok)
         return effort;
@@ -301,9 +354,10 @@ function commonParsed(flags, opts = {}) {
     }
     const prompt = flags.get('prompt');
     if (prompt === true)
-        return { ok: false, error: '--prompt 不能为空' };
-    if (typeof prompt === 'string' && prompt.length > 4096)
-        return { ok: false, error: '--prompt 超过 4096 字符限制' };
+        return { ok: false, error: '--prompt 不能为空；复杂内容建议改用 --prompt-file <path>' };
+    if (typeof prompt === 'string' && prompt.length > 4096 && !opts.allowLongPrompt) {
+        return { ok: false, error: '--prompt 超过 4096 字符限制；复杂内容建议改用 --prompt-file <path>' };
+    }
     const scriptPath = flags.get('script-path');
     if (scriptPath === true)
         return { ok: false, error: '--script-path 不能为空' };
@@ -326,7 +380,13 @@ function commonParsed(flags, opts = {}) {
     if ((targetChannel === undefined) !== (targetChannelId === undefined)) {
         return { ok: false, error: '--target-channel 与 --target-channel-id 必须同时指定或同时省略' };
     }
-    const inferredExecution = execution.value ?? (scriptPath ? 'script' : 'target_session');
+    if (!opts.update && !execution.value) {
+        return { ok: false, error: '创建 trigger 必须显式指定 --exec script|trigger-session|target-session' };
+    }
+    const inferredExecution = execution.value;
+    if (baseagent.value && inferredExecution !== 'trigger_session') {
+        return { ok: false, error: '--baseagent 仅适用于 --exec trigger-session' };
+    }
     if (inferredExecution === 'script') {
         if (!scriptPath && !opts.update)
             return { ok: false, error: '--exec script 需要 --script-path' };
@@ -357,6 +417,7 @@ function commonParsed(flags, opts = {}) {
             scriptArgs,
             scriptTimeoutMs: scriptTimeout.value,
             triggerThread: triggerThread.value,
+            baseagent: baseagent.value,
             maxRuns: maxRuns.value,
             maxDuration: maxDuration.value,
             model: model.value,
@@ -366,10 +427,13 @@ function commonParsed(flags, opts = {}) {
     };
 }
 export function parseTriggerSet(args) {
+    const syntaxError = promptSyntaxError(args);
+    if (syntaxError)
+        return { ok: false, error: syntaxError };
     const flags = parseFlags(args);
     const parsed = commonParsed(flags);
     if (!parsed.ok)
-        return parsed;
+        return { ok: false, error: withPromptFileHint(parsed.error, args) };
     const value = parsed.value;
     return {
         ok: true,
@@ -391,6 +455,46 @@ export function parseTriggerSet(args) {
             scriptArgs: value.scriptArgs,
             scriptTimeoutMs: value.scriptTimeoutMs,
             triggerThread: value.triggerThread,
+            baseagent: value.baseagent,
+            maxRuns: value.maxRuns,
+            maxDuration: value.maxDuration,
+            model: value.model,
+            effort: value.effort,
+            permissionMode: value.permissionMode,
+        },
+    };
+}
+/** CLI argv parser. Unlike the slash-command string parser, this preserves
+ * shell-quoted values such as `--prompt "multi word text"` as one token. */
+export function parseTriggerSetArgv(args, opts = {}) {
+    const parsedFlags = flagsFromArgv(args, 'create');
+    if (!parsedFlags.ok)
+        return { ok: false, error: withPromptFileHint(parsedFlags.error, args, opts) };
+    const parsed = commonParsed(parsedFlags.flags, opts);
+    if (!parsed.ok)
+        return { ok: false, error: withPromptFileHint(parsed.error, args, opts) };
+    const value = parsed.value;
+    return {
+        ok: true,
+        value: {
+            scheduleType: value.scheduleType,
+            scheduleValue: value.scheduleValue ?? '',
+            timezone: value.timezone,
+            executionType: value.inferredExecution,
+            feedbackStrategy: value.feedbackStrategy,
+            targetChannel: value.targetChannel,
+            targetChannelId: value.targetChannelId,
+            targetSession: value.targetSession,
+            targetThreadId: value.targetThreadId,
+            agentId: value.agentId,
+            name: value.name,
+            prompt: value.prompt,
+            scriptPath: value.scriptPath,
+            scriptRuntime: value.scriptRuntime,
+            scriptArgs: value.scriptArgs,
+            scriptTimeoutMs: value.scriptTimeoutMs,
+            triggerThread: value.triggerThread,
+            baseagent: value.baseagent,
             maxRuns: value.maxRuns,
             maxDuration: value.maxDuration,
             model: value.model,
@@ -422,15 +526,26 @@ export function parseTriggerUpdate(args) {
     }
     if (!rest)
         return { ok: false, error: '至少需要指定一个修改参数（如 --prompt、--delay、--event 等）' };
+    const syntaxError = promptSyntaxError(rest);
+    if (syntaxError)
+        return { ok: false, error: syntaxError };
     const flags = parseFlags(rest);
-    return parseTriggerUpdateFlags(nameOrId, flags);
+    const parsed = parseTriggerUpdateFlags(nameOrId, flags);
+    return parsed.ok ? parsed : { ok: false, error: withPromptFileHint(parsed.error, rest) };
+}
+export function parseTriggerUpdateArgv(nameOrId, args, opts = {}) {
+    const parsedFlags = flagsFromArgv(args, 'update');
+    if (!parsedFlags.ok)
+        return { ok: false, error: withPromptFileHint(parsedFlags.error, args, opts) };
+    const parsed = parseTriggerUpdateFlags(nameOrId, parsedFlags.flags, opts);
+    return parsed.ok ? parsed : { ok: false, error: withPromptFileHint(parsed.error, args, opts) };
 }
-export function parseTriggerUpdateArgv(nameOrId, args) {
+function flagsFromArgv(args, command) {
     const flags = new Map();
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
         if (!arg.startsWith('--'))
-            return { ok: false, error: `无法识别 update 参数: ${arg}` };
+            return { ok: false, error: `无法识别 ${command} 参数: ${arg}` };
         const equals = arg.indexOf('=');
         if (equals > 2) {
             flags.set(arg.slice(2, equals), arg.slice(equals + 1));
@@ -446,16 +561,16 @@ export function parseTriggerUpdateArgv(nameOrId, args) {
             flags.set(key, true);
         }
     }
-    return parseTriggerUpdateFlags(nameOrId, flags);
+    return { ok: true, flags };
 }
-function parseTriggerUpdateFlags(nameOrId, flags) {
+function parseTriggerUpdateFlags(nameOrId, flags, opts = {}) {
     if (flags.size === 0)
         return { ok: false, error: '至少需要指定一个修改参数（如 --prompt、--delay、--event 等）' };
     for (const flag of flags.keys()) {
         if (!TRIGGER_UPDATE_FLAGS.has(flag))
             return { ok: false, error: `update 不支持参数 --${flag}` };
     }
-    const parsed = commonParsed(flags, { update: true });
+    const parsed = commonParsed(flags, { update: true, ...opts });
     if (!parsed.ok)
         return parsed;
     const value = parsed.value;

package/dist/trigger/patch.js

@@ -13,7 +13,7 @@ const PATCH_KEYS = new Set([
     'concurrency',
     'missedPolicy',
 ]);
-export function applyTriggerPatch(definition, input) {
+export function applyTriggerPatch(definition, input, opts = {}) {
     if (!input || typeof input !== 'object' || Array.isArray(input)) {
         throw new Error('trigger patch must be an object');
     }
@@ -30,6 +30,9 @@ export function applyTriggerPatch(definition, input) {
         updated.name = String(patch.name);
     applySourcePatch(updated, patch);
     if (patch.prompt !== undefined) {
+        if (opts.fromPromptFile && updated.execution.type === 'script') {
+            throw new Error('script 类型 trigger 不支持 --prompt-file；请修改脚本文件后重新创建 trigger');
+        }
         if (updated.execution.type === 'script')
             updated.feedback.onReply = { template: String(patch.prompt) };
         else
@@ -80,7 +83,7 @@ export function replaceEditableTriggerDefinition(existing, input) {
         throw new Error('trigger definition update must be an object');
     }
     const editable = input;
-    return normalizeTriggerDefinition({
+    const replacement = normalizeTriggerDefinition({
         ...editable,
         $schema_version: TRIGGER_SCHEMA_VERSION,
         id: existing.id,
@@ -90,6 +93,13 @@ export function replaceEditableTriggerDefinition(existing, input) {
         updatedAt: existing.updatedAt,
         origin: existing.origin,
     });
+    assertBaseagentImmutable(existing, replacement);
+    return replacement;
+}
+function assertBaseagentImmutable(existing, updated) {
+    if (existing.execution.baseagent !== updated.execution.baseagent) {
+        throw new Error('execution.baseagent is immutable; create a new Trigger to use another baseagent');
+    }
 }
 function applySourcePatch(updated, patch) {
     const previous = updated.source;