Merge remote-tracking branch 'origin/staging' into staging-v4

Resolved by taking staging's copilot refactor (mv/mkdir/cp consolidation, sim_key chips, CredentialLinkDisplay extraction, streaming-arg titles) and re-grafting the desktop-only additions on top: desktopLocalFilesystem + browserCapable payload params, local-filesystem tool schemas, local_*/browser_* tool display titles, and the folder_access grant chip. Dropped the user-skill (load_user_skill) wiring — staging removed lib/mothership/skills in mothership v0.8. Generated tool catalog/schemas regenerated from the copilot contract with staging's sync script. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Sg312 · Jul 29, 2026 · Jul 18, 2026 · Jul 18, 2026 · Jul 18, 2026 · Jul 18, 2026
commit fb4c2deca0cac9b1170ff2033faddea42832f119
diff --git a/...ce/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx b/...ce/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx
@@ -231,7 +231,11 @@ function isCredentialTagData(value: unknown): value is CredentialTagData {
   if (value.type === 'folder_access') {
     return value.name === undefined || typeof value.name === 'string'
   }
-  if (value.redacted === true) return value.value === undefined || typeof value.value === 'string'
+  // A sim_key chip is platform-filled: the model only marks where the workspace
+  // API key belongs (it never holds the value) and Sim injects it from the tool
+  // result, so the tag is valid with or without a `value`. Every other rendered
+  // type (e.g. link) needs a string value to render.
+  if (value.type === 'sim_key') return true
   return typeof value.value === 'string'
 }
 
@@ -925,7 +929,7 @@ function FolderAccessDisplay({ data }: { data: CredentialTagData }) {
       onClick={() => void handleClick()}
       disabled={picking || grantedName !== null}
       className={cn(
-        'flex w-full items-center gap-2 rounded-lg border border-[var(--divider)] px-3 py-2.5 text-left transition-colors',
+        'flex w-full items-center gap-2 rounded-2xl border border-[var(--border-1)] px-3 py-2.5 text-left transition-colors',
         grantedName === null && !picking && 'hover-hover:bg-[var(--surface-5)]',
         picking && 'opacity-60'
       )}
@@ -941,7 +945,7 @@ function FolderAccessDisplay({ data }: { data: CredentialTagData }) {
   )
 }
 
-function CredentialDisplay({ data }: { data: CredentialTagData }) {
+function CredentialLinkDisplay({ data }: { data: CredentialTagData }) {
   const { canEdit } = useUserPermissionsContext()
 
   // A connect URL carrying a credentialId re-authorizes that existing

diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-helpers.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-helpers.ts
@@ -19,7 +19,6 @@ import {
   ManageMcpTool,
   ManageScheduledTask,
   ManageSkill,
-  ManageSkillOperation,
   QueryLogs,
   Redeploy,
   RunFromBlock,
@@ -31,6 +30,7 @@ import {
   WorkspaceFileOperation,
 } from '@/lib/copilot/generated/tool-catalog-v1'
 import { VFS_DIR_TO_RESOURCE } from '@/lib/copilot/resources/types'
+import { extractStreamingStringArgument } from '@/lib/copilot/tools/streaming-args'
 import { getToolDisplayTitle, mvDisplayVerb } from '@/lib/copilot/tools/tool-display'
 import type { ContentBlock, MothershipResource } from '@/app/workspace/[workspaceId]/home/types'
 import { ToolCallStatus } from '@/app/workspace/[workspaceId]/home/types'
@@ -55,7 +55,7 @@ export const WORKFLOW_MUTATION_TOOL_NAMES: Set<string> = new Set([
   'mv',
   'cp',
   DeleteWorkflow.id,
-  // Grace-period transcript/checkpoint compatibility.
+  // Removed legacy tools, kept while their grace-period executors remain.
   'move_workflow',
   'rename_workflow',
 ])
@@ -381,12 +381,20 @@ export function resolveStreamingToolDisplayTitle(
   if (name === 'mv') {
     const toolTitle = matchStreamingStringArg(streamingArgs, 'toolTitle')
     if (!toolTitle) return undefined
+    // Same rename-vs-move derivation as the settled title: single source with
+    // only the leaf changing reads as a rename.
     const multiSource = /"sources"\s*:\s*\[\s*"[^"]*"\s*,/.test(streamingArgs)
     const firstSource = streamingArgs.match(/"sources"\s*:\s*\[\s*"([^"]*)"/m)?.[1]
     const destination = matchStreamingStringArg(streamingArgs, 'destination')
     const verb = multiSource
       ? 'Moving'
       : mvDisplayVerb(firstSource ? decodeStreamingString(firstSource) : undefined, destination)
+    if (verb === 'Renaming' && firstSource && destination) {
+      return getToolDisplayTitle(name, {
+        sources: [decodeStreamingString(firstSource)],
+        destination,
+      })
+    }
     return `${verb} ${toolTitle}`
   }
 
@@ -447,17 +455,23 @@ export function resolveStreamingToolDisplayTitle(
   }
 
   if (name === ManageFolder.id) {
-    // create/rename/move remain here for checkpoint and transcript compatibility.
-    return resolveOperationDisplayTitle(
-      matchStreamingStringArg(streamingArgs, 'operation'),
-      {
-        create: 'Creating folder',
-        rename: 'Renaming folder',
-        move: 'Moving folder',
-        [ManageFolderOperation.delete]: 'Deleting folder',
-      },
-      'Folder action'
-    )
+    // create/rename/move are string literals: the live tool only offers delete
+    // (mkdir/mv replaced the rest), but grace-period checkpoint resumes and
+    // transcript replays still stream the legacy operations.
+    const operation = matchStreamingStringArg(streamingArgs, 'operation')
+    if (!operation) return undefined
+    return getToolDisplayTitle(name, {
+      operation,
+      path:
+        matchStreamingStringArg(streamingArgs, 'oldPath') ??
+        matchStreamingStringArg(streamingArgs, 'source') ??
+        matchStreamingStringArg(streamingArgs, 'path'),
+      name:
+        matchStreamingStringArg(streamingArgs, 'newPath') ??
+        matchStreamingStringArg(streamingArgs, 'destination') ??
+        matchStreamingStringArg(streamingArgs, 'newName') ??
+        matchStreamingStringArg(streamingArgs, 'name'),
+    })
   }
 
   return undefined

diff --git a/apps/sim/lib/copilot/chat/payload.ts b/apps/sim/lib/copilot/chat/payload.ts
@@ -52,7 +52,6 @@ interface BuildPayloadParams {
     email?: string
     timezone?: string
   }
-  includeMothershipTools?: boolean
   desktopLocalFilesystem?: boolean
   browserCapable?: boolean
 }
@@ -388,23 +387,16 @@ export async function buildCopilotRequestPayload(
     )
   }
 
-    if (params.includeMothershipTools && params.workspaceId) {
-      // Expose all workspace user-created skills via the single load_user_skill
-      // tool. Available to every user; content is fetched sim-side when the
-      // model calls it.
-      try {
-        const userSkillTool = await buildUserSkillTool(params.workspaceId)
-        if (userSkillTool) mothershipTools.push(userSkillTool)
-      } catch (error) {
-        logger.warn('Failed to build load_user_skill tool', {
-          error: toError(error).message,
-        })
-      }
-    }
+  if (params.workspaceId && params.mcpServerIds?.length) {
+    mothershipTools = await buildTaggedMcpToolSchemas(
+      userId,
+      params.workspaceId,
+      params.mcpServerIds
+    )
+  }
 
-    if (params.desktopLocalFilesystem) {
-      mothershipTools.push(...buildLocalFilesystemToolSchemas())
-    }
+  if (effectiveMode === 'build' && params.desktopLocalFilesystem) {
+    mothershipTools.push(...buildLocalFilesystemToolSchemas())
   }
 
   return {

diff --git a/apps/sim/lib/copilot/chat/post.ts b/apps/sim/lib/copilot/chat/post.ts
@@ -738,7 +738,6 @@ async function resolveBranch(params: {
           entitlements: payloadParams.entitlements,
           userTimezone: payloadParams.userTimezone,
           userMetadata: payloadParams.userMetadata,
-          includeMothershipTools: true,
           desktopLocalFilesystem: payloadParams.desktopLocalFilesystem,
           browserCapable: payloadParams.browserCapable,
         },
@@ -1093,7 +1092,8 @@ export async function handleUnifiedChatPost(req: NextRequest) {
                 vfs,
                 desktopLocalFilesystem: body.desktopCapabilities?.localFilesystem === true,
                 browserCapable: body.browserCapable === true,
-              }),
+              })
+        },
         activeOtelRoot.context
       )