improvement(repo): update ship skills, flatten internal tools contracts dir (#4379)

* improvement(repo): update ship skills, flatten internal tools contracts dir

* update baselines

* address comments

Author: icecrasher321

.agents/skills/ship/SKILL.md

@@ -13,21 +13,20 @@ When the user runs `/ship`:
 
 1. **Check git status** - See what files have changed
 2. **Generate a commit message** following this format: `type(scope): description`
-   - Types: `fix`, `feat`, `improvement`, `chore`
-   - Scope: short identifier (e.g., `undo-redo`, `api`, `ui`)
-   - Keep it concise
-
-3. **Run lint** - Run `bun run lint` from the repo root to fix formatting issues before staging
-
+  - Types: `fix`, `feat`, `improvement`, `chore`
+  - Scope: short identifier (e.g., `undo-redo`, `api`, `ui`)
+  - Keep it concise
+3. **Run pre-ship checks** from the repo root before staging:
+  - `bun run lint` to fix formatting issues
+  - `bun run check:api-validation:strict` to catch boundary contract failures before CI
 4. **Stage and commit** the changes with the generated message
-
 5. **Push to origin** using the current branch name
-
 6. **Create a PR** to staging with a description in the user's voice
 
 ## Commit Message Format
 
 Based on the repo's commit history:
+
 ```
 fix(scope): description for bug fixes
 feat(scope): description for new features
@@ -61,6 +60,7 @@ Tested manually (or describe testing)
 ## PR Creation Command
 
 Use this command structure:
+
 ```bash
 gh pr create --base staging --title "COMMIT_MESSAGE" --body "PR_BODY"
 ```
@@ -77,6 +77,7 @@ gh pr create --base staging --title "COMMIT_MESSAGE" --body "PR_BODY"
 
 - Short, direct bullet points
 - No unnecessary explanation
-- "Tested manually" is acceptable for testing section
+- "Tested manually" is acceptable for testing section; include lint and boundary validation results when run
 - Checkboxes filled in appropriately
 - No screenshots section unless UI changes
+

.claude/commands/ship.md

@@ -17,7 +17,9 @@ When the user runs `/ship`:
    - Scope: short identifier (e.g., `undo-redo`, `api`, `ui`)
    - Keep it concise
 
-3. **Run lint** - Run `bun run lint` from the repo root to fix formatting issues before staging
+3. **Run pre-ship checks** from the repo root before staging:
+   - `bun run lint` to fix formatting issues
+   - `bun run check:api-validation:strict` to catch boundary contract failures before CI
 
 4. **Stage and commit** the changes with the generated message
 
@@ -77,6 +79,6 @@ gh pr create --base staging --title "COMMIT_MESSAGE" --body "PR_BODY"
 
 - Short, direct bullet points
 - No unnecessary explanation
-- "Tested manually" is acceptable for testing section
+- "Tested manually" is acceptable for testing section; include lint and boundary validation results when run
 - Checkboxes filled in appropriately
 - No screenshots section unless UI changes

.cursor/commands/ship.md

@@ -12,7 +12,9 @@ When the user runs `/ship`:
    - Scope: short identifier (e.g., `undo-redo`, `api`, `ui`)
    - Keep it concise
 
-3. **Run lint** - Run `bun run lint` from the repo root to fix formatting issues before staging
+3. **Run pre-ship checks** from the repo root before staging:
+   - `bun run lint` to fix formatting issues
+   - `bun run check:api-validation:strict` to catch boundary contract failures before CI
 
 4. **Stage and commit** the changes with the generated message
 
@@ -72,6 +74,6 @@ gh pr create --base staging --title "COMMIT_MESSAGE" --body "PR_BODY"
 
 - Short, direct bullet points
 - No unnecessary explanation
-- "Tested manually" is acceptable for testing section
+- "Tested manually" is acceptable for testing section; include lint and boundary validation results when run
 - Checkboxes filled in appropriately
 - No screenshots section unless UI changes

apps/sim/app/api/tools/a2a/cancel-task/route.ts

@@ -2,7 +2,7 @@ import type { Task } from '@a2a-js/sdk'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aCancelTaskContract } from '@/lib/api/contracts/tools/internal/a2a'
+import { a2aCancelTaskContract } from '@/lib/api/contracts/tools/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/delete-push-notification/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aDeletePushNotificationContract } from '@/lib/api/contracts/tools/internal/a2a'
+import { a2aDeletePushNotificationContract } from '@/lib/api/contracts/tools/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/get-agent-card/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aGetAgentCardContract } from '@/lib/api/contracts/tools/internal/a2a'
+import { a2aGetAgentCardContract } from '@/lib/api/contracts/tools/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/get-push-notification/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aGetPushNotificationContract } from '@/lib/api/contracts/tools/internal/a2a'
+import { a2aGetPushNotificationContract } from '@/lib/api/contracts/tools/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/get-task/route.ts

@@ -2,7 +2,7 @@ import type { Task } from '@a2a-js/sdk'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aGetTaskContract } from '@/lib/api/contracts/tools/internal/a2a'
+import { a2aGetTaskContract } from '@/lib/api/contracts/tools/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/resubscribe/route.ts

@@ -9,7 +9,7 @@ import type {
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient, extractTextContent, isTerminalState } from '@/lib/a2a/utils'
-import { a2aResubscribeContract } from '@/lib/api/contracts/tools/internal/a2a'
+import { a2aResubscribeContract } from '@/lib/api/contracts/tools/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/send-message/route.ts

@@ -4,7 +4,7 @@ import { toError } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient, extractTextContent, isTerminalState } from '@/lib/a2a/utils'
-import { a2aSendMessageContract } from '@/lib/api/contracts/tools/internal/a2a'
+import { a2aSendMessageContract } from '@/lib/api/contracts/tools/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'