Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: export object-root riddle tool parameters

Adam Eivy41188ed51b37
diff --git a/server/lib/eidoverseControllers.js b/server/lib/eidoverseControllers.js
index a7b538c42f..e81ecb83e4 100644
--- a/server/lib/eidoverseControllers.js
+++ b/server/lib/eidoverseControllers.js
@@ -164,12 +164,22 @@ export const eidoverseControllerConfigUpdateSchema = z.object({
export const eidoverseControllerArmSchema = z.object({ id: controllerInstallIdSchema, armed: z.boolean() }).strict();
// Explicit shipped gameplay, never an interpreter for foundation bodies.
-const riddleActionBase = { id: controllerInstallIdSchema, expectedRevision: z.number().int().nonnegative() };
-export const eidoverseRiddleActionSchema = z.discriminatedUnion('action', [
- z.object({ ...riddleActionBase, action: z.literal('offer'), clue: z.string().trim().min(1).max(200), answer: z.string().trim().min(1).max(120) }).strict(),
- z.object({ ...riddleActionBase, action: z.literal('guess'), guess: z.string().trim().min(1).max(120) }).strict(),
- z.object({ ...riddleActionBase, action: z.literal('reveal') }).strict(),
-]);
+// Provider tool parameters need an object root. Refinements keep the HTTP/tool
+// runtime action-specific without exporting a top-level oneOf to providers.
+export const eidoverseRiddleActionSchema = z.object({
+ id: controllerInstallIdSchema,
+ expectedRevision: z.number().int().nonnegative(),
+ action: z.enum(['offer', 'guess', 'reveal']),
+ clue: z.string().trim().min(1).max(200).optional(),
+ answer: z.string().trim().min(1).max(120).optional(),
+ guess: z.string().trim().min(1).max(120).optional(),
+}).strict().superRefine((input, ctx) => {
+ const fields = input.action === 'offer' ? ['clue', 'answer'] : input.action === 'guess' ? ['guess'] : [];
+ for (const field of ['clue', 'answer', 'guess']) {
+ if (fields.includes(field) && input[field] === undefined) ctx.addIssue({ code: 'custom', path: [field], message: `Required for ${input.action}` });
+ if (!fields.includes(field) && input[field] !== undefined) ctx.addIssue({ code: 'custom', path: [field], message: `Not accepted for ${input.action}` });
+ }
+});
/** Who installed this, at the coarsest grain that is still useful — the same
* three actors a foundation records, and deliberately no display name. */
diff --git a/server/routes/eidoverseRiddle.test.js b/server/routes/eidoverseRiddle.test.js
index e893d1638e..16653c247b 100644
--- a/server/routes/eidoverseRiddle.test.js
+++ b/server/routes/eidoverseRiddle.test.js
@@ -86,6 +86,8 @@ describe('explicit Eidoverse riddle round', () => {
expect((await act({ ...offer, answer: '' })).status).toBe(400);
expect((await act({ ...offer, clue: 'x'.repeat(201) })).status).toBe(400);
expect((await act({ ...offer, action: 'interpret' })).status).toBe(400);
+ expect((await act({ action: 'offer', expectedRevision: 0, clue: 'Synthetic clue' })).status).toBe(400);
+ expect((await act({ action: 'reveal', expectedRevision: 0, answer: 'triangle' })).status).toBe(400);
await act(offer);
expect((await act(offer)).body.outcome).toBe('refused');
expect((await act({ ...offer, expectedRevision: 1 })).body.outcome).toBe('refused');
diff --git a/server/services/cosToolRegistry.test.js b/server/services/cosToolRegistry.test.js
index 64889ba72a..d1a933afb5 100644
--- a/server/services/cosToolRegistry.test.js
+++ b/server/services/cosToolRegistry.test.js
@@ -146,6 +146,14 @@ describe('cosToolRegistry', () => {
const result = await executeCosToolCall({ call, authority: { scope: 'mind', capabilities: { manageEidoverse: true, installEidoverseControllers: true } } });
expect(result.result).toMatchObject({ outcome: 'applied', install: { state: { revision: 3, revealed: true } }, delivery: { status: 'refused' } });
expect(mocks.interactRiddle).toHaveBeenCalledWith(call.arguments, expect.any(Object));
+ const catalog = getCosToolCatalog({ scope: 'mind', capabilities: { manageEidoverse: true, installEidoverseControllers: true } });
+ for (const format of ['openai', 'anthropic']) {
+ const exported = formatCosToolCatalog(catalog, format).tools.find((tool) => (tool.function?.name || tool.name) === 'eidoverse_riddle');
+ const parameters = exported.function?.parameters || exported.input_schema;
+ expect(parameters).toMatchObject({ type: 'object', required: ['id', 'expectedRevision', 'action'], additionalProperties: false });
+ expect(parameters).not.toHaveProperty('oneOf');
+ expect(parameters.properties.action.enum).toEqual(['offer', 'guess', 'reveal']);
+ }
});
it('delivers bounded stopped-task reasons under the observation grant without enabling reports', async () => {
const tasks = Array.from({ length: 2 }, (_, index) => ({ id: `invented-task-${index}`,