7d0a0ae3ba
* fix(discord): gate autoThread by thread owner * fix(discord): ack bot-owned autoThreads * fix(discord): ack mentions in open channels - Ack reactions in bot-owned autoThreads - Ack reactions in open channels (no mention required) - DRY: Pass pre-computed isAutoThreadOwnedByBot to avoid redundant checks - Consolidate ack logic with explanatory comment * fix: allow null values in exec.approval.request schema The ExecApprovalRequestParamsSchema was rejecting null values for optional fields like resolvedPath, but the calling code in bash-tools.exec.ts passes null. This caused intermittent 'invalid exec.approval.request params' validation errors. Fix: Accept Type.Union([Type.String(), Type.Null()]) for all optional string fields in the schema. Update test to reflect new behavior. * fix: align discord ack reactions with mention gating (#1511) (thanks @pvoo) --------- Co-authored-by: Wimmie <wimmie@tameson.com> Co-authored-by: Peter Steinberger <steipete@gmail.com>
113 lines
3.2 KiB
TypeScript
113 lines
3.2 KiB
TypeScript
import { Type } from "@sinclair/typebox";
|
|
|
|
import { NonEmptyString } from "./primitives.js";
|
|
|
|
export const ExecApprovalsAllowlistEntrySchema = Type.Object(
|
|
{
|
|
id: Type.Optional(NonEmptyString),
|
|
pattern: Type.String(),
|
|
lastUsedAt: Type.Optional(Type.Integer({ minimum: 0 })),
|
|
lastUsedCommand: Type.Optional(Type.String()),
|
|
lastResolvedPath: Type.Optional(Type.String()),
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalsDefaultsSchema = Type.Object(
|
|
{
|
|
security: Type.Optional(Type.String()),
|
|
ask: Type.Optional(Type.String()),
|
|
askFallback: Type.Optional(Type.String()),
|
|
autoAllowSkills: Type.Optional(Type.Boolean()),
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalsAgentSchema = Type.Object(
|
|
{
|
|
security: Type.Optional(Type.String()),
|
|
ask: Type.Optional(Type.String()),
|
|
askFallback: Type.Optional(Type.String()),
|
|
autoAllowSkills: Type.Optional(Type.Boolean()),
|
|
allowlist: Type.Optional(Type.Array(ExecApprovalsAllowlistEntrySchema)),
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalsFileSchema = Type.Object(
|
|
{
|
|
version: Type.Literal(1),
|
|
socket: Type.Optional(
|
|
Type.Object(
|
|
{
|
|
path: Type.Optional(Type.String()),
|
|
token: Type.Optional(Type.String()),
|
|
},
|
|
{ additionalProperties: false },
|
|
),
|
|
),
|
|
defaults: Type.Optional(ExecApprovalsDefaultsSchema),
|
|
agents: Type.Optional(Type.Record(Type.String(), ExecApprovalsAgentSchema)),
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalsSnapshotSchema = Type.Object(
|
|
{
|
|
path: NonEmptyString,
|
|
exists: Type.Boolean(),
|
|
hash: NonEmptyString,
|
|
file: ExecApprovalsFileSchema,
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalsGetParamsSchema = Type.Object({}, { additionalProperties: false });
|
|
|
|
export const ExecApprovalsSetParamsSchema = Type.Object(
|
|
{
|
|
file: ExecApprovalsFileSchema,
|
|
baseHash: Type.Optional(NonEmptyString),
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalsNodeGetParamsSchema = Type.Object(
|
|
{
|
|
nodeId: NonEmptyString,
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalsNodeSetParamsSchema = Type.Object(
|
|
{
|
|
nodeId: NonEmptyString,
|
|
file: ExecApprovalsFileSchema,
|
|
baseHash: Type.Optional(NonEmptyString),
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalRequestParamsSchema = Type.Object(
|
|
{
|
|
id: Type.Optional(NonEmptyString),
|
|
command: NonEmptyString,
|
|
cwd: Type.Optional(Type.Union([Type.String(), Type.Null()])),
|
|
host: Type.Optional(Type.Union([Type.String(), Type.Null()])),
|
|
security: Type.Optional(Type.Union([Type.String(), Type.Null()])),
|
|
ask: Type.Optional(Type.Union([Type.String(), Type.Null()])),
|
|
agentId: Type.Optional(Type.Union([Type.String(), Type.Null()])),
|
|
resolvedPath: Type.Optional(Type.Union([Type.String(), Type.Null()])),
|
|
sessionKey: Type.Optional(Type.Union([Type.String(), Type.Null()])),
|
|
timeoutMs: Type.Optional(Type.Integer({ minimum: 1 })),
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|
|
|
|
export const ExecApprovalResolveParamsSchema = Type.Object(
|
|
{
|
|
id: NonEmptyString,
|
|
decision: NonEmptyString,
|
|
},
|
|
{ additionalProperties: false },
|
|
);
|