Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(scheduler): 前置检查命令的 shell 语法错误不再被当成跳过
Dash09fb611fcbeb
diff --git a/apps/desktop/src/main/maker-ipc/schedule.ts b/apps/desktop/src/main/maker-ipc/schedule.tsindex fa408955e5..bbd0184b14 100644--- a/apps/desktop/src/main/maker-ipc/schedule.ts+++ b/apps/desktop/src/main/maker-ipc/schedule.ts@@ -59,7 +59,10 @@ import {import { createLogger } from '../logger.js';import type { DrizzleScheduleStorage } from '../scheduler-host/storage.js';-import { executePreRunHook } from '../scheduler-host/pre-run-hook.js';+import {+ assertPreRunHookCommandSyntax,+ executePreRunHook,+} from '../scheduler-host/pre-run-hook.js';import {HookScriptUtilityModelError,installHookScript,@@ -346,8 +349,10 @@ export function registerScheduleHandlers(getMaker?: () => Maker | null): void {};const hookPathDeps = {resolveSessionWorkDir,- stabilizeCommand: async (input: { command: string; workingDir?: string }) =>- stabilizeHookCommand(input.command, input.workingDir),+ stabilizeCommand: async (input: { command: string; workingDir?: string }) => {+ await assertPreRunHookCommandSyntax(input.command);+ return stabilizeHookCommand(input.command, input.workingDir);+ },};ipcMain.handle(MAKER_INVOKE.SCHEDULE_LIST, async (_e, filter: unknown) =>diff --git a/apps/desktop/src/main/mcp-integrations/mcp-providers.ts b/apps/desktop/src/main/mcp-integrations/mcp-providers.tsindex 2fa59a8912..29c05495ed 100644--- a/apps/desktop/src/main/mcp-integrations/mcp-providers.ts+++ b/apps/desktop/src/main/mcp-integrations/mcp-providers.ts@@ -45,6 +45,7 @@ import { createLogger } from '../logger.js';import { checkAppUpdateForAgent } from '../updateService.js';import { getScheduler } from '../scheduler-host/index.js';import { stabilizeHookCommand } from '../scheduler-host/hook-script-generator.js';+import { assertPreRunHookCommandSyntax } from '../scheduler-host/pre-run-hook.js';import { searchSessionsWithBotScope } from '../maker-host/session-search.js';import { readLspModeSettings } from '../maker-host/lsp-mode-store.js';import {@@ -354,8 +355,10 @@ export function createDesktopMcpProviders(deps: DesktopMcpProvidersDeps): LiziMcreturn undefined;}},- stabilizeCommand: async ({ command, workingDir }) =>- stabilizeHookCommand(command, workingDir),+ stabilizeCommand: async ({ command, workingDir }) => {+ await assertPreRunHookCommandSyntax(command);+ return stabilizeHookCommand(command, workingDir);+ },install: async (input) => {const [{ installHookScript }, { getMaker }, { app }] = await Promise.all([import('../scheduler-host/hook-script-generator.js'),diff --git a/apps/desktop/src/main/scheduler-host/__tests__/preRunHook.test.ts b/apps/desktop/src/main/scheduler-host/__tests__/preRunHook.test.tsindex f1a3bcfd2a..63e993845e 100644--- a/apps/desktop/src/main/scheduler-host/__tests__/preRunHook.test.ts+++ b/apps/desktop/src/main/scheduler-host/__tests__/preRunHook.test.ts@@ -10,7 +10,10 @@import { describe, expect, it } from 'vitest';import {+ assertPreRunHookCommandSyntax,executePreRunHook,+ findShellSyntaxError,+ formatPreRunHookFailure,resolvePreRunHookTimeoutMs,type PreRunHookStdinPayload,} from '../pre-run-hook';@@ -116,6 +119,22 @@ describe('executePreRunHook', () => {expect(result.exitCode).not.toBe(0);});+ it.skipIf(process.platform === 'win32')(+ 'shell 语法错误(sh 退出码同为 2)按失败阻止,不当成跳过',+ async () => {+ const result = await executePreRunHook({+ // 2026-10 真实事故:单引号没配平,sh 以 2 退出,被误记为"本轮跳过"+ command: `node -e "process.exit(0)" '//`,+ stdinPayload: payload,+ });+ expect(result.status).toBe('failed');+ expect(result.decision).toBe('block');+ expect(result.error).toMatch(/^shell syntax error in command: /);+ expect(result.stderr).not.toBe('');+ expect(formatPreRunHookFailure(result)).toContain('shell syntax error');+ },+ );+it('spawn 失败会保留启动错误并阻止执行', async () => {const result = await executePreRunHook({command: 'node -e "process.exit(0)"',@@ -170,6 +189,27 @@ describe('executePreRunHook', () => {}, 15_000);});+describe.skipIf(process.platform === 'win32')('前置检查命令语法预检', () => {+ it('语法正确的命令(含引号路径、管道、heredoc)不报错,且不会被执行', async () => {+ await expect(findShellSyntaxError(`node '/a b/x.mjs' --flag`)).resolves.toBeUndefined();+ await expect(findShellSyntaxError('git fetch -q && python3 - scan <<EOF\nx\nEOF')).resolves.toBeUndefined();+ // -n 只解析:即使命令会失败也不报语法错误+ await expect(findShellSyntaxError('exit 7')).resolves.toBeUndefined();+ });++ it('引号未配平 / 结构未闭合 → 返回 shell 报错', async () => {+ await expect(findShellSyntaxError(`node '/a b/x.mjs'//'`)).resolves.toBeTruthy();+ await expect(findShellSyntaxError('if true; then echo')).resolves.toBeTruthy();+ });++ it('保存时校验:语法错误抛 invalid,正确命令放行', async () => {+ await expect(assertPreRunHookCommandSyntax(`node '/a b/x.mjs'//'`)).rejects.toThrow(+ /^invalid pre-run hook configuration: shell syntax error in command: /,+ );+ await expect(assertPreRunHookCommandSyntax(`xdt-node '/a b/x.mjs'`)).resolves.toBeUndefined();+ });+});+describe('resolvePreRunHookTimeoutMs(无默认超时)', () => {it('未传 / 非法 / ≤0 → undefined(不限时,不回落任何默认值)', () => {expect(resolvePreRunHookTimeoutMs(undefined)).toBeUndefined();diff --git a/apps/desktop/src/main/scheduler-host/pre-run-hook.ts b/apps/desktop/src/main/scheduler-host/pre-run-hook.tsindex 51a7a1f13a..0acc627c20 100644--- a/apps/desktop/src/main/scheduler-host/pre-run-hook.ts+++ b/apps/desktop/src/main/scheduler-host/pre-run-hook.ts@@ -8,6 +8,8 @@* 脚本可读可不读。* - exit 0 → 放行本轮;exit 2 → 跳过本轮;其它退出码 / 超时 / spawn 失败 →* fail-closed 阻止本轮并记录失败,避免前置检查异常时绕过闸门。+ * - POSIX 下执行前先 `sh -n` 预检命令语法:sh 的语法错误退出码恰好也是 2,+ * 不预检会把"引号没配平"之类的命令错误当成正常跳过,任务悄悄停摆。* - 超时**仅在显式配置 timeoutMs 时生效**,未配置 = 不限时(产品决策:* 不设默认超时;代价是 hook 卡死会阻塞该轮 fire,由配置方自担)。*@@ -17,7 +19,7 @@* - stdout/stderr 各截断 8KB,防脚本刷屏撑爆 run 记录与日志。*/-import { spawn } from 'node:child_process';+import { execFile, spawn } from 'node:child_process';import type { PreRunHookRunResult } from '@cindy/maker-scheduler';import { capAppend as capAppendBase, killProcessTree } from './proc-util';import os from 'node:os';@@ -95,6 +97,45 @@ function firstLine(text: string): string {return line.length > 200 ? `${line.slice(0, 200)}…` : line;}+/** POSIX 下 spawn(shell:true) 实际使用的解释器;语法预检必须用同一个。 */+const POSIX_SHELL = '/bin/sh';+const SYNTAX_CHECK_TIMEOUT_MS = 5_000;++/**+ * POSIX shell 语法预检(`sh -n -c`,只解析不执行)。返回 shell 的报错文本;语法+ * 正确、Windows(cmd.exe 没有对应能力)或预检本身没能完成(spawn 失败 / 超时)+ * 时返回 undefined,交给真实执行按原协议处理。+ */+export function findShellSyntaxError(command: string): Promise<string | undefined> {+ if (process.platform === 'win32') return Promise.resolve(undefined);+ return new Promise((resolve) => {+ execFile(+ POSIX_SHELL,+ ['-n', '-c', command],+ { timeout: SYNTAX_CHECK_TIMEOUT_MS },+ (err, _stdout, stderr) => {+ // 只有 shell 正常退出且非 0 才是语法错误;err.code 为字符串(ENOENT 等)或+ // 超时被杀时不下结论。+ if (!err || typeof err.code !== 'number') {+ resolve(undefined);+ return;+ }+ resolve(String(stderr).trim() || `${POSIX_SHELL} -n exited with code ${err.code}`);+ },+ );+ });+}++/** 保存任务前校验前置检查命令;语法错误抛 invalid,让写错的命令当场被拒。 */+export async function assertPreRunHookCommandSyntax(command: string): Promise<void> {+ const syntaxError = await findShellSyntaxError(resolveHookCommand(command).command);+ if (syntaxError) {+ throw new Error(+ `invalid pre-run hook configuration: shell syntax error in command: ${firstLine(syntaxError)}`,+ );+ }+}+/** 显式配置的正数才启用超时;未传 / 非法 / ≤0 → undefined(不限时)。 */export function resolvePreRunHookTimeoutMs(timeoutMs: number | undefined): number | undefined {if (typeof timeoutMs !== 'number' || !Number.isFinite(timeoutMs) || timeoutMs <= 0) {@@ -110,21 +151,40 @@ export function resolvePreRunHookTimeoutMs(timeoutMs: number | undefined): numbeexport async function executePreRunHook(input: PreRunHookInput): Promise<PreRunHookResult> {const timeoutMs = resolvePreRunHookTimeoutMs(input.timeoutMs);const startedAt = Date.now();+ const abortedResult = (): PreRunHookResult => ({+ status: 'aborted',+ decision: 'block',+ exitCode: null,+ durationMs: Date.now() - startedAt,+ stdout: '',+ stderr: '',+ stdoutTruncated: false,+ stderrTruncated: false,+ timedOut: false,+ aborted: true,+ });// 进门先查:任务已被 pause/delete(信号已 abort)→ 不 spawn,直接返回- if (input.signal?.aborted) {+ if (input.signal?.aborted) return abortedResult();++ const resolved = resolveHookCommand(input.command);+ const syntaxError = await findShellSyntaxError(resolved.command);+ if (input.signal?.aborted) return abortedResult();+ if (syntaxError) {return {- status: 'aborted',+ status: 'failed',decision: 'block',exitCode: null,- durationMs: 0,+ durationMs: Date.now() - startedAt,stdout: '',- stderr: '',+ stderr: capAppendBase('', syntaxError, OUTPUT_CAP),stdoutTruncated: false,- stderrTruncated: false,+ stderrTruncated: syntaxError.length > OUTPUT_CAP,timedOut: false,- aborted: true,+ aborted: false,+ error: `shell syntax error in command: ${firstLine(syntaxError)}`,};}+return new Promise<PreRunHookResult>((resolve) => {let stdout = '';let stderr = '';@@ -203,7 +263,6 @@ export async function executePreRunHook(input: PreRunHookInput): Promise<PreRunH};input.signal?.addEventListener('abort', onAbort, { once: true });- const resolved = resolveHookCommand(input.command);try {child = spawn(resolved.command, {shell: true,diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 079eb1b4cb..87cc22e75a 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -438,6 +438,8 @@ Desktop 的任务行、置顶卡片与任务顶部通过既有 `maker:schedule:l截断时记录可选 `checkSucceeded: true`;错误、超时、取消和退避跳过不构成恢复。该标记只恢复此前的检查故障,不恢复 Agent 执行失败;旧脚本不输出、旧客户端不识别均不影响原有退出码语义。实现见 `scheduler-host/pre-run-hook.ts` 与 `scheduler-host/storage.ts`。+macOS/Linux 上命令先经 `sh -n` 语法预检:shell 语法错误的退出码同为 2,不预检会被误记为+跳过而让任务悄悄停摆。保存时直接拒绝(INVALID_PARAMS),已保存的旧命令在运行时按失败记录并提醒。## 用量历史跨设备合并