address comments

Author: icecrasher321

.agents/skills/ship/SKILL.md

@@ -1,7 +1,7 @@
 ---
-
-## name: ship
+name: ship
 description: Commit, push, and open a PR to staging in one shot
+---
 
 # Ship Command
 

apps/sim/lib/api/contracts/tools/a2a.ts

@@ -1,15 +1,7 @@
 import { z } from 'zod'
+import { genericToolResponseSchema } from '@/lib/api/contracts/tools/shared'
 import { defineRouteContract } from '@/lib/api/contracts/types'
 
-const internalToolResponseSchema = z
-  .object({
-    success: z.boolean().optional(),
-    output: z.unknown().optional(),
-    error: z.string().optional(),
-    details: z.array(z.unknown()).optional(),
-  })
-  .passthrough()
-
 const a2aBaseBodySchema = z.object({
   agentUrl: z.string().min(1, 'Agent URL is required'),
   apiKey: z.string().optional(),
@@ -61,7 +53,7 @@ export const a2aGetAgentCardContract = defineRouteContract({
   body: a2aGetAgentCardBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })
 
@@ -71,7 +63,7 @@ export const a2aSendMessageContract = defineRouteContract({
   body: a2aSendMessageBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })
 
@@ -81,7 +73,7 @@ export const a2aGetTaskContract = defineRouteContract({
   body: a2aGetTaskBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })
 
@@ -91,7 +83,7 @@ export const a2aCancelTaskContract = defineRouteContract({
   body: a2aCancelTaskBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })
 
@@ -101,7 +93,7 @@ export const a2aResubscribeContract = defineRouteContract({
   body: a2aResubscribeBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })
 
@@ -111,7 +103,7 @@ export const a2aSetPushNotificationContract = defineRouteContract({
   body: a2aSetPushNotificationBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })
 
@@ -121,7 +113,7 @@ export const a2aGetPushNotificationContract = defineRouteContract({
   body: a2aGetPushNotificationBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })
 
@@ -131,6 +123,6 @@ export const a2aDeletePushNotificationContract = defineRouteContract({
   body: a2aDeletePushNotificationBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })

apps/sim/lib/api/contracts/tools/cursor.ts

@@ -1,15 +1,7 @@
 import { z } from 'zod'
+import { genericToolResponseSchema } from '@/lib/api/contracts/tools/shared'
 import { defineRouteContract } from '@/lib/api/contracts/types'
 
-const internalToolResponseSchema = z
-  .object({
-    success: z.boolean().optional(),
-    output: z.unknown().optional(),
-    error: z.string().optional(),
-    details: z.array(z.unknown()).optional(),
-  })
-  .passthrough()
-
 export const cursorDownloadArtifactBodySchema = z.object({
   apiKey: z.string().min(1, 'API key is required'),
   agentId: z.string().min(1, 'Agent ID is required'),
@@ -22,6 +14,6 @@ export const cursorDownloadArtifactContract = defineRouteContract({
   body: cursorDownloadArtifactBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })

apps/sim/lib/api/contracts/tools/index.ts

@@ -21,6 +21,7 @@ export * from './pipedrive'
 export * from './quiver'
 export * from './sap'
 export * from './search'
+export * from './shared'
 export * from './stagehand'
 export * from './thinking'
 export * from './workday'

apps/sim/lib/api/contracts/tools/quiver.ts

@@ -1,16 +1,8 @@
 import { z } from 'zod'
+import { genericToolResponseSchema } from '@/lib/api/contracts/tools/shared'
 import { defineRouteContract } from '@/lib/api/contracts/types'
 import { FileInputSchema } from '@/lib/uploads/utils/file-schemas'
 
-const internalToolResponseSchema = z
-  .object({
-    success: z.boolean().optional(),
-    output: z.unknown().optional(),
-    error: z.string().optional(),
-    details: z.array(z.unknown()).optional(),
-  })
-  .passthrough()
-
 const quiverCommonBodySchema = z.object({
   apiKey: z.string().min(1),
   model: z.string().min(1),
@@ -42,7 +34,7 @@ export const quiverTextToSvgContract = defineRouteContract({
   body: quiverTextToSvgBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })
 
@@ -52,6 +44,6 @@ export const quiverImageToSvgContract = defineRouteContract({
   body: quiverImageToSvgBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })

apps/sim/lib/api/contracts/tools/sap.ts

@@ -1,15 +1,7 @@
 import { z } from 'zod'
+import { genericToolResponseSchema } from '@/lib/api/contracts/tools/shared'
 import { defineRouteContract } from '@/lib/api/contracts/types'
 
-const internalToolResponseSchema = z
-  .object({
-    success: z.boolean().optional(),
-    output: z.unknown().optional(),
-    error: z.string().optional(),
-    details: z.array(z.unknown()).optional(),
-  })
-  .passthrough()
-
 const sapHttpMethodSchema = z.enum(['GET', 'POST', 'PATCH', 'PUT', 'DELETE', 'MERGE'])
 const sapDeploymentTypeSchema = z.enum(['cloud_public', 'cloud_private', 'on_premise'])
 const sapAuthTypeSchema = z.enum(['oauth_client_credentials', 'basic'])
@@ -278,6 +270,6 @@ export const sapS4HanaProxyContract = defineRouteContract({
   body: sapS4HanaProxyBodySchema,
   response: {
     mode: 'json',
-    schema: internalToolResponseSchema,
+    schema: genericToolResponseSchema,
   },
 })

apps/sim/lib/api/contracts/tools/shared.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod'
+
+export const genericToolResponseSchema = z
+  .object({
+    success: z.boolean().optional(),
+    output: z.unknown().optional(),
+    error: z.string().optional(),
+    details: z.array(z.unknown()).optional(),
+  })
+  .passthrough()