@swarmclawai/swarmclaw 0.9.3 → 0.9.4

package/src/lib/server/connectors/manager.ts

@@ -30,6 +30,7 @@ import { markProviderFailure, markProviderSuccess } from '../provider-health'
 import { syncSessionArchiveMemory } from '@/lib/server/memory/session-archive-memory'
 import { buildIdentityContinuityContext } from '../identity-continuity'
 import { ensureAgentThreadSession } from '@/lib/server/agents/agent-thread-session'
+import { buildRuntimeSkillPromptBlocks, resolveRuntimeSkills } from '@/lib/server/skills/runtime-skill-resolver'
 import { getProvider } from '@/lib/providers'
 import type { Agent, Connector, MessageSource, Chatroom, ChatroomMessage, Session } from '@/types'
 import type { ConnectorInstance, InboundMessage } from './types'
@@ -57,6 +58,8 @@ import {
   textMentionsAlias,
 } from './policy'
 import { buildConnectorThreadContextBlock } from './thread-context'
+import { isDirectConnectorSession } from './session-kind'
+import { enforceSenderQuietBoundary } from './contact-boundaries'
 import { shouldSuppressHiddenControlText, stripHiddenControlTokens } from '@/lib/server/agents/assistant-control'
 import {
   buildInboundApprovalSubject as buildInboundApprovalSubjectHelper,
@@ -1198,7 +1201,7 @@ async function routeMessageToChatroom(connector: Connector, msg: InboundMessage)
     }
 
     const syntheticSession = ensureSyntheticSession(agent, chatroomId)
-    const agentSystemPrompt = buildAgentSystemPromptForChatroom(agent)
+    const agentSystemPrompt = buildAgentSystemPromptForChatroom(agent, syntheticSession.cwd)
     const chatroomContext = buildChatroomSystemPrompt(freshChatroom, agents, agent.id)
     const fullSystemPrompt = [agentSystemPrompt, chatroomContext, threadContextBlock].filter(Boolean).join('\n\n')
     const history = buildHistoryForAgent(freshChatroom, agent.id)
@@ -1418,6 +1421,26 @@ async function routeMessage(connector: Connector, msg: InboundMessage): Promise<
     return NO_MESSAGE_SENTINEL
   }
 
+  const quietBoundary = enforceSenderQuietBoundary({
+    agent,
+    connector,
+    session,
+    msg,
+  })
+  if (quietBoundary.suppress) {
+    logExecution(session.id, 'decision', 'Connector inbound suppressed by sender quiet boundary', {
+      agentId: agent.id,
+      detail: {
+        platform: msg.platform,
+        channelId: msg.channelId,
+        senderId: msg.senderId,
+        senderName: msg.senderName,
+        memoryTitle: quietBoundary.memoryTitle || null,
+      },
+    })
+    return NO_MESSAGE_SENTINEL
+  }
+
   if (parsedCommand) {
     const commandResult = await handleConnectorCommand({
       command: parsedCommand,
@@ -1520,13 +1543,21 @@ async function routeMessage(connector: Connector, msg: InboundMessage): Promise<
   promptParts.push(buildCurrentDateTimePromptContext())
   if (agent.soul) promptParts.push(agent.soul)
   if (agent.systemPrompt) promptParts.push(agent.systemPrompt)
-  if (agent.skillIds?.length) {
-    const allSkills = loadSkills()
-    for (const skillId of agent.skillIds) {
-      const skill = allSkills[skillId]
-      if (skill?.content) promptParts.push(`## Skill: ${skill.name}\n${skill.content}`)
-    }
-  }
+  try {
+    const enabledPlugins = dedup([
+      ...(Array.isArray(session.plugins) ? session.plugins : []),
+      ...(Array.isArray(agent.plugins) ? agent.plugins : []),
+      ...(Array.isArray(agent.tools) ? agent.tools : []),
+    ])
+    const runtimeSkills = resolveRuntimeSkills({
+      cwd: session.cwd,
+      enabledPlugins,
+      agentSkillIds: agent.skillIds || [],
+      storedSkills: loadSkills(),
+      selectedSkillId: session.skillRuntimeState?.selectedSkillId || null,
+    })
+    promptParts.push(...buildRuntimeSkillPromptBlocks(runtimeSkills))
+  } catch { /* non-critical */ }
   const thinkLevel = resolveConnectorSessionPolicy(connector, msg, session).thinkingLevel || ''
   if (thinkLevel) {
     promptParts.push(`Connector thinking guidance: ${thinkLevel}. Keep responses concise and useful for chat.`)
@@ -2343,7 +2374,7 @@ export async function sendConnectorMessage(params: {
   if (params.sessionId) {
     const sessions = loadSessions()
     const session = sessions[params.sessionId]
-    if (session) {
+    if (session && isDirectConnectorSession(session)) {
       session.connectorContext = {
         ...(session.connectorContext || {}),
         connectorId,

package/src/lib/server/connectors/session-consolidation.ts

@@ -4,6 +4,7 @@
  */
 import { loadSessions, loadSettings, saveSettings, upsertStoredItem } from '../storage'
 import type { Session } from '@/types'
+import { isDirectConnectorSession } from './session-kind'
 
 const MIGRATION_FLAG = '_migration_allKnownPeerIds'
 
@@ -17,6 +18,7 @@ export function backfillAllKnownPeerIds(): { migrated: number; skipped: boolean
   let migrated = 0
 
   for (const session of Object.values(sessions)) {
+    if (!isDirectConnectorSession(session)) continue
     const ctx = session?.connectorContext
     if (!ctx?.connectorId) continue
     if (Array.isArray(ctx.allKnownPeerIds) && ctx.allKnownPeerIds.length > 0) continue

package/src/lib/server/connectors/session-kind.ts

@@ -0,0 +1,7 @@
+export function isDirectConnectorSession(session?: unknown): boolean {
+  if (!session || typeof session !== 'object') return false
+  const record = session as Record<string, unknown>
+  const user = typeof record.user === 'string' ? record.user.trim() : ''
+  const name = typeof record.name === 'string' ? record.name.trim() : ''
+  return user === 'connector' || name.startsWith('connector:')
+}

package/src/lib/server/connectors/session.test.ts

@@ -193,6 +193,110 @@ describe('connectors/session', () => {
       assert.ok(found)
       assert.equal(found!.id, created.session.id)
     })
+
+    it('returns null when multiple direct sessions match without a unique thread or sender match', () => {
+      const now = Date.now()
+      storage.saveSessions({
+        'sess-a': {
+          id: 'sess-a',
+          name: 'connector:discord:alice',
+          user: 'connector',
+          provider: 'anthropic',
+          model: 'claude-3',
+          messages: [],
+          createdAt: now,
+          lastActiveAt: now,
+          agentId: 'agent-1',
+          connectorContext: {
+            connectorId: 'conn-1',
+            channelId: 'shared-channel',
+            senderId: 'alice-1',
+          },
+        },
+        'sess-b': {
+          id: 'sess-b',
+          name: 'connector:discord:bob',
+          user: 'connector',
+          provider: 'anthropic',
+          model: 'claude-3',
+          messages: [],
+          createdAt: now,
+          lastActiveAt: now,
+          agentId: 'agent-1',
+          connectorContext: {
+            connectorId: 'conn-1',
+            channelId: 'shared-channel',
+            senderId: 'bob-1',
+          },
+        },
+      })
+
+      const connector = {
+        id: 'conn-1',
+        name: 'Test',
+        platform: 'discord' as const,
+        agentId: 'agent-1',
+        config: {},
+        enabled: true,
+        createdAt: now,
+        updatedAt: now,
+      } as unknown as Connector
+
+      const result = mod.findDirectSessionForInbound(connector, {
+        platform: 'discord',
+        channelId: 'shared-channel',
+        senderId: 'unknown-user',
+        senderName: 'Unknown',
+        text: 'hello',
+      })
+
+      assert.equal(result, null)
+    })
+
+    it('returns null when the inbound thread id does not match an existing direct thread session', () => {
+      const now = Date.now()
+      storage.saveSessions({
+        'sess-thread': {
+          id: 'sess-thread',
+          name: 'connector:discord:thread',
+          user: 'connector',
+          provider: 'anthropic',
+          model: 'claude-3',
+          messages: [],
+          createdAt: now,
+          lastActiveAt: now,
+          agentId: 'agent-1',
+          connectorContext: {
+            connectorId: 'conn-1',
+            channelId: 'channel-1',
+            senderId: 'user-1',
+            threadId: 'thread-1',
+          },
+        },
+      })
+
+      const connector = {
+        id: 'conn-1',
+        name: 'Test',
+        platform: 'discord' as const,
+        agentId: 'agent-1',
+        config: {},
+        enabled: true,
+        createdAt: now,
+        updatedAt: now,
+      } as unknown as Connector
+
+      const result = mod.findDirectSessionForInbound(connector, {
+        platform: 'discord',
+        channelId: 'channel-1',
+        senderId: 'user-1',
+        senderName: 'User',
+        text: 'hello',
+        threadId: 'thread-2',
+      })
+
+      assert.equal(result, null)
+    })
   })
 
   // ---- updateSessionConnectorContext ----

package/src/lib/server/connectors/session.ts

@@ -12,6 +12,7 @@ import {
   resetConnectorSessionRuntime,
   resolveConnectorSessionPolicy,
 } from './policy'
+import { isDirectConnectorSession } from './session-kind'
 import { resolveThreadPersonaLabel } from './thread-context'
 import type { InboundMessage } from './types'
 
@@ -40,7 +41,8 @@ export function findDirectSessionForInbound(connector: Connector, msg: InboundMe
   const senderIds = new Set([msg.senderId, msg.senderIdAlt].filter(Boolean))
   const sessions = Object.values(loadSessions() as Record<string, ConnectorSession>)
   const candidates = sessions.filter((session) =>
-    session?.agentId === effectiveAgentId
+    isDirectConnectorSession(session)
+      && session?.agentId === effectiveAgentId
       && session?.connectorContext?.connectorId === connector.id
       && (
         channelIds.has(session?.connectorContext?.channelId || '')
@@ -51,6 +53,7 @@ export function findDirectSessionForInbound(connector: Connector, msg: InboundMe
   if (msg.threadId) {
     const threadExact = candidates.find((session) => session?.connectorContext?.threadId === msg.threadId)
     if (threadExact) return threadExact
+    return null
   }
   const senderExact = candidates.find((session) =>
     senderIds.has(session?.connectorContext?.senderId || '')
@@ -64,7 +67,7 @@ export function findDirectSessionForInbound(connector: Connector, msg: InboundMe
   )
   if (peerIdMatch) return peerIdMatch
 
-  return candidates[0] || null
+  return candidates.length === 1 ? candidates[0] : null
 }
 
 export function persistSessionRecord(session: ConnectorSession): void {

package/src/lib/server/identity-continuity.test.ts

@@ -32,9 +32,9 @@ test('buildIdentityContinuityContext merges agent and session continuity', () =>
 test('refreshSessionIdentityState derives fallback continuity fields', () => {
   const session = {
     id: 's1',
-    name: 'Checkout Bug',
+    name: 'connector:checkout-bug',
     cwd: process.cwd(),
-    user: 'Taylor',
+    user: 'connector',
     provider: 'openai',
     model: 'gpt-4.1',
     claudeSessionId: null,
@@ -61,7 +61,8 @@ test('refreshSessionIdentityState derives fallback continuity fields', () => {
 test('buildIdentityContinuityContext prefers thread persona labels from connector context', () => {
   const block = buildIdentityContinuityContext(
     {
-      name: 'Connector Session',
+      name: 'connector:session',
+      user: 'connector',
       connectorContext: {
         threadId: 'thread-9',
         threadPersonaLabel: 'Checkout Incident',

package/src/lib/server/identity-continuity.ts

@@ -1,4 +1,5 @@
 import type { Agent, IdentityContinuityState, Session } from '@/types'
+import { isDirectConnectorSession } from '@/lib/server/connectors/session-kind'
 
 function normalizeText(value: unknown, maxChars: number): string | null {
   if (typeof value !== 'string') return null
@@ -49,11 +50,12 @@ function fallbackSelfSummary(agent?: Partial<Agent> | null): string | null {
 }
 
 function fallbackPersonaLabel(session?: Partial<Session> | null, agent?: Partial<Agent> | null): string | null {
-  const threadPersona = normalizeText(session?.connectorContext?.threadPersonaLabel, 120)
+  const connectorContext = isDirectConnectorSession(session) ? session?.connectorContext : null
+  const threadPersona = normalizeText(connectorContext?.threadPersonaLabel, 120)
   if (threadPersona) return threadPersona
-  const threadTitle = normalizeText(session?.connectorContext?.threadTitle, 120)
+  const threadTitle = normalizeText(connectorContext?.threadTitle, 120)
   if (threadTitle) return threadTitle
-  const threadId = normalizeText(session?.connectorContext?.threadId, 80)
+  const threadId = normalizeText(connectorContext?.threadId, 80)
   if (threadId) return `${agent?.name || 'Agent'} thread ${threadId}`
   const sessionName = normalizeText(session?.name, 120)
   if (sessionName && !/^new chat$/i.test(sessionName)) return sessionName
@@ -61,7 +63,9 @@ function fallbackPersonaLabel(session?: Partial<Session> | null, agent?: Partial
 }
 
 function fallbackRelationshipSummary(session?: Partial<Session> | null): string | null {
-  const sender = normalizeText(session?.connectorContext?.senderName, 80)
+  const sender = isDirectConnectorSession(session)
+    ? normalizeText(session?.connectorContext?.senderName, 80)
+    : null
   if (sender) return `Ongoing conversation with ${sender}.`
   const user = normalizeText(session?.user, 80)
   if (user && user !== 'user') return `Ongoing conversation with ${user}.`

package/src/lib/server/memory/session-archive-memory.ts

@@ -5,6 +5,7 @@ import type { Agent, MemoryEntry, MemoryReference, Session } from '@/types'
 import { getMemoryDb } from '@/lib/server/memory/memory-db'
 import { loadAgents, loadSessions, saveSessions } from '@/lib/server/storage'
 import { DATA_DIR } from '@/lib/server/data-dir'
+import { isDirectConnectorSession } from '@/lib/server/connectors/session-kind'
 
 const MAX_ARCHIVE_MESSAGES = 36
 const MAX_ARCHIVE_LINE_CHARS = 320
@@ -16,7 +17,7 @@ function toOneLine(value: unknown, maxChars: number): string {
 
 function messageSpeaker(session: Session, agent: Partial<Agent> | null | undefined, message: Session['messages'][number]): string {
   if (message.role === 'assistant') return agent?.name || 'assistant'
-  return session.connectorContext?.senderName || session.user || 'user'
+  return (isDirectConnectorSession(session) ? session.connectorContext?.senderName : null) || session.user || 'user'
 }
 
 function slugifySegment(value: string, fallback: string): string {

package/src/lib/server/session-reset-policy.test.ts

@@ -28,8 +28,16 @@ function makeSession(overrides: Partial<Session> = {}): Session {
 
 test('inferSessionResetType distinguishes direct, group, and thread sessions', () => {
   assert.equal(inferSessionResetType(makeSession()), 'direct')
-  assert.equal(inferSessionResetType(makeSession({ connectorContext: { isGroup: true } })), 'group')
-  assert.equal(inferSessionResetType(makeSession({ connectorContext: { threadId: 'thread-1' } })), 'thread')
+  assert.equal(inferSessionResetType(makeSession({
+    name: 'connector:group',
+    user: 'connector',
+    connectorContext: { isGroup: true },
+  })), 'group')
+  assert.equal(inferSessionResetType(makeSession({
+    name: 'connector:thread',
+    user: 'connector',
+    connectorContext: { threadId: 'thread-1' },
+  })), 'thread')
 })
 
 test('resolveSessionResetPolicy falls back to type defaults', () => {
@@ -37,7 +45,13 @@ test('resolveSessionResetPolicy falls back to type defaults', () => {
   assert.equal(direct.mode, 'idle')
   assert.equal(direct.idleTimeoutSec, 12 * 60 * 60)
 
-  const thread = resolveSessionResetPolicy({ session: makeSession({ connectorContext: { threadId: 'thread-1' } }) })
+  const thread = resolveSessionResetPolicy({
+    session: makeSession({
+      name: 'connector:thread',
+      user: 'connector',
+      connectorContext: { threadId: 'thread-1' },
+    }),
+  })
   assert.equal(thread.mode, 'idle')
   assert.equal(thread.idleTimeoutSec, 4 * 60 * 60)
 })

package/src/lib/server/session-reset-policy.ts

@@ -1,4 +1,5 @@
 import type { Agent, AppSettings, Session, SessionResetMode, SessionResetType } from '@/types'
+import { isDirectConnectorSession } from '@/lib/server/connectors/session-kind'
 
 export interface ResolvedSessionResetPolicy {
   type: SessionResetType
@@ -140,9 +141,10 @@ export function inferSessionResetType(
   opts?: { isGroup?: boolean | null; threadId?: string | null },
 ): SessionResetType {
   if ((session?.sessionType as string | undefined) === 'orchestrated') return 'main'
-  const threadId = opts?.threadId ?? session?.connectorContext?.threadId ?? null
+  const connectorContext = isDirectConnectorSession(session) ? session?.connectorContext : null
+  const threadId = opts?.threadId ?? connectorContext?.threadId ?? null
   if (threadId) return 'thread'
-  const isGroup = opts?.isGroup ?? session?.connectorContext?.isGroup ?? false
+  const isGroup = opts?.isGroup ?? connectorContext?.isGroup ?? false
   return isGroup ? 'group' : 'direct'
 }
 

package/src/lib/server/session-tools/connector.ts

@@ -13,6 +13,7 @@ import { normalizeToolInputArgs } from './normalize-tool-args'
 import { safeJsonParseObject } from '../json-utils'
 import { tryResolvePathWithinBaseDir } from '../path-utils'
 import { dedup, errorMessage } from '@/lib/shared-utils'
+import { isDirectConnectorSession } from '../connectors/session-kind'
 
 const CONNECTOR_ACTION_DEDUPE_TTL_MS = 30_000
 const CONNECTOR_TURN_SEND_TTL_MS = 180_000
@@ -341,11 +342,14 @@ function trimToString(value: unknown): string {
 
 function resolveSessionConnectorTargets(
   session: {
+    user?: string
+    name?: string
     connectorContext?: Record<string, unknown>
     messages?: Array<Record<string, unknown>>
   } | null | undefined,
   connectorId: string,
 ): Array<{ channelId: string; senderId?: string; senderName?: string }> {
+  if (!isDirectConnectorSession(session)) return []
   const targets: Array<{ channelId: string; senderId?: string; senderName?: string }> = []
   const seen = new Set<string>()
   const pushTarget = (target: { channelId: string; senderId?: string; senderName?: string } | null) => {
@@ -368,6 +372,7 @@ function resolveSessionConnectorTargets(
 
   const messages = Array.isArray(session?.messages) ? session.messages : []
   for (let i = messages.length - 1; i >= 0; i -= 1) {
+    if (messages[i]?.historyExcluded === true) continue
     const source = messages[i]?.source as Record<string, unknown> | undefined
     if (!source || trimToString(source.connectorId) !== connectorId) continue
     const channelId = trimToString(source.channelId)
@@ -386,8 +391,9 @@ function pickChannelTarget(params: {
   connector: { config?: Record<string, string> }
   connectorId: string
   to?: string
-  recentChannelId: string | null
   currentSession?: {
+    user?: string
+    name?: string
     connectorContext?: Record<string, unknown>
     messages?: Array<Record<string, unknown>>
   } | null
@@ -421,9 +427,6 @@ function pickChannelTarget(params: {
     const outbound = connector.config?.outboundTarget?.trim()
     if (outbound) channelId = outbound
   }
-  if (!channelId && params.recentChannelId) {
-    channelId = params.recentChannelId
-  }
   if (!channelId) {
     const allowed = parseCsv(connector.config?.allowedJids)
     if (allowed.length) channelId = allowed[0]
@@ -562,7 +565,6 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
     const {
       listRunningConnectors,
       sendConnectorMessage,
-      getConnectorRecentChannelId,
       scheduleConnectorFollowUp,
       performConnectorMessageAction,
     } = await import('../connectors/manager')
@@ -646,6 +648,7 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
 
     const currentSession = bctx.resolveCurrentSession?.()
     const sessionId = bctx.ctx?.sessionId || currentSession?.id || undefined
+    const connectorScopedSessionId = isDirectConnectorSession(currentSession) ? sessionId : undefined
 
     if (actionName === 'send' || actionName === 'send_voice_note' || actionName === 'schedule_followup') {
       const settings = loadSettings()
@@ -662,7 +665,6 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
         connector,
         connectorId: selected.id,
         to,
-        recentChannelId: getConnectorRecentChannelId(selected.id),
         currentSession,
       })
       if (target.error) return target.error
@@ -728,7 +730,7 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
         const sent = await sendConnectorMessage({
           connectorId: selected.id, channelId, text: '', mediaPath: voicePath, mimeType: outboundMimeType,
           fileName: fileName?.trim() || 'voicenote.mp3', caption: caption?.trim() || undefined, ptt: ptt ?? true,
-          sessionId,
+          sessionId: connectorScopedSessionId,
           replyToMessageId: replyToMessageId?.trim() || undefined,
           threadId: threadId?.trim() || undefined,
         })
@@ -768,7 +770,7 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
           connectorId: selected.id,
           channelId,
           text: followupText,
-          sessionId,
+          sessionId: connectorScopedSessionId,
           delaySec: followupDelay,
           dedupeKey: dedupeKey?.trim() || undefined,
           imageUrl: media.imageUrl,
@@ -793,7 +795,7 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
 
       const sent = await sendConnectorMessage({
         connectorId: selected.id, channelId, text: message?.trim() || '',
-        sessionId,
+        sessionId: connectorScopedSessionId,
         imageUrl: media.imageUrl, fileUrl: media.fileUrl, mediaPath: media.mediaPath,
         mimeType: mimeType?.trim() || undefined, fileName: fileName?.trim() || undefined,
         caption: caption?.trim() || undefined,
@@ -815,7 +817,6 @@ async function executeConnectorAction(input: ConnectorActionInput, bctx: Connect
         connector: resolved.connector,
         connectorId: selected.id,
         to,
-        recentChannelId: getConnectorRecentChannelId(selected.id),
         currentSession,
       })
       if (target.error) return target.error

package/src/lib/server/session-tools/crud.ts

@@ -46,6 +46,8 @@ import { safePath, findBinaryOnPath } from './context'
 import { normalizeToolInputArgs } from './normalize-tool-args'
 import type { BoardTask } from '@/types'
 import { dedup } from '@/lib/shared-utils'
+import { isDirectConnectorSession } from '../connectors/session-kind'
+import { buildManageSkillsDescription, executeManageSkillsAction } from './skills'
 
 // ---------------------------------------------------------------------------
 // Document helpers
@@ -258,8 +260,10 @@ function deriveScheduleFollowupTarget(sessionId: string | null | undefined): {
     }
   }
 
-  const contextTarget = pickSourceFields(session.connectorContext || undefined)
-  if (contextTarget.followupConnectorId && contextTarget.followupChannelId) return contextTarget
+  if (isDirectConnectorSession(session as { user?: string; name?: string })) {
+    const contextTarget = pickSourceFields(session.connectorContext || undefined)
+    if (contextTarget.followupConnectorId && contextTarget.followupChannelId) return contextTarget
+  }
 
   const messages = Array.isArray(session.messages) ? session.messages : []
   for (let i = messages.length - 1; i >= 0; i -= 1) {
@@ -447,12 +451,17 @@ export function buildCrudTools(bctx: ToolBuildContext): StructuredToolInterface[
       if (ctx?.projectId) {
         description += `\n\nCurrent project context: "${ctx.projectName || ctx.projectId}" (projectId "${ctx.projectId}"). Omit "projectId" to link the secret to this active project.`
       }
+    } else if (toolKey === 'manage_skills') {
+      description = buildManageSkillsDescription()
     }
 
     tools.push(
       tool(
         async (rawArgs) => {
           const normalized = normalizeToolInputArgs((rawArgs ?? {}) as Record<string, unknown>)
+          if (toolKey === 'manage_skills') {
+            return executeManageSkillsAction(normalized, bctx)
+          }
           const action = normalized.action as string | undefined
           const id = normalized.id as string | undefined
           const data = normalized.data as string | undefined
@@ -881,11 +890,36 @@ export function buildCrudTools(bctx: ToolBuildContext): StructuredToolInterface[
         {
           name: toolKey,
           description,
-          schema: z.object({
-            action: z.enum(['list', 'get', 'create', 'update', 'delete']).describe('The CRUD action to perform'),
-            id: z.string().optional().describe('Resource ID (required for get, update, delete)'),
-            data: z.string().optional().describe('JSON string of fields for create/update'),
-          }).passthrough(),
+          schema: toolKey === 'manage_skills'
+            ? z.object({
+                action: z.enum([
+                  'list',
+                  'get',
+                  'create',
+                  'update',
+                  'delete',
+                  'status',
+                  'search_available',
+                  'recommend_for_task',
+                  'attach',
+                  'install',
+                ]).describe('The manage_skills action to perform'),
+                id: z.string().optional().describe('Stored skill ID or runtime skill selector'),
+                skillId: z.string().optional().describe('Alternate skill selector'),
+                name: z.string().optional().describe('Skill name or marketplace name'),
+                query: z.string().optional().describe('Search query or task description'),
+                task: z.string().optional().describe('Task description for skill recommendation'),
+                url: z.string().optional().describe('Remote skill URL for install'),
+                approvalId: z.string().optional().describe('Approved install request id'),
+                attach: z.boolean().optional().describe('Attach the skill to the current agent after install'),
+                agentId: z.string().optional().describe('Target agent id for attach'),
+                data: z.string().optional().describe('JSON string of fields for create/update'),
+              }).passthrough()
+            : z.object({
+                action: z.enum(['list', 'get', 'create', 'update', 'delete']).describe('The CRUD action to perform'),
+                id: z.string().optional().describe('Resource ID (required for get, update, delete)'),
+                data: z.string().optional().describe('JSON string of fields for create/update'),
+              }).passthrough(),
         },
       ),
     )

package/src/lib/server/session-tools/index.ts

@@ -45,6 +45,7 @@ import { buildExtractTools } from './extract'
 import { buildTableTools } from './table'
 import { buildCrawlTools } from './crawl'
 import { buildGoogleWorkspaceTools } from './google-workspace'
+import { buildSkillRuntimeTools } from './skill-runtime'
 import './connector'
 import { normalizeToolInputArgs } from './normalize-tool-args'
 import { enforceFileAccessPolicy } from './file-access-policy'
@@ -172,6 +173,7 @@ export async function buildSessionTools(cwd: string, enabledPlugins: string[], c
       ['calendar', buildCalendarTools],
       ['replicate', buildReplicateTools],
       ['google_workspace', buildGoogleWorkspaceTools],
+      ['use_skill', buildSkillRuntimeTools],
       ['mailbox', buildMailboxTools],
       ['ask_human', buildHumanLoopTools],
       ['document', buildDocumentTools],