Fix rebase fallout after master update

packages/shared/src/index.ts

@@ -847,11 +847,6 @@ export {
 } from "./document-anchors.js";
 
 export {
-  buildExternalObjectScopedIdentityKey,
-  buildExternalObjectMentionSourceKey,
-  canonicalizeExternalObjectUrl,
-  extractExternalObjectCanonicalUrls,
-  findExternalObjectUrlMatches,
   formatExternalObjectMentionSourceLabel,
   type ExternalObjectCanonicalIdentity,
   type ExternalObjectCanonicalUrl,

server/src/__tests__/external-object-routes.test.ts

@@ -14,6 +14,7 @@ const mockIssueService = vi.hoisted(() => ({
 }));
 
 const mockAccessService = vi.hoisted(() => ({
+  decide: vi.fn(),
   hasPermission: vi.fn(),
 }));
 
@@ -40,9 +41,20 @@ function registerRouteMocks() {
     instanceSettingsService: () => mockInstanceSettingsService,
   }));
 
+  vi.doMock("../services/task-watchdog-scope.js", () => ({
+    TASK_WATCHDOG_ORIGIN_KIND: "task_watchdog",
+    resolveTaskWatchdogMutationScope: vi.fn(async () => ({ kind: "none" })),
+    taskWatchdogScopeAllowsIssueMutation: vi.fn(async () => ({ kind: "none" })),
+  }));
+
   vi.doMock("../services/index.js", () => ({
     accessService: () => mockAccessService,
     agentService: () => mockAgentService,
+    companyService: () => ({
+      getById: vi.fn(async () => null),
+    }),
+    companySearchService: () => ({}),
+    documentAnnotationService: () => ({}),
     documentService: () => ({}),
     executionWorkspaceService: () => ({}),
     feedbackService: () => ({}),
@@ -55,6 +67,7 @@ function registerRouteMocks() {
       cancelRun: vi.fn(async () => null),
     }),
     issueApprovalService: () => ({}),
+    issueRecoveryActionService: () => ({}),
     issueReferenceService: () => ({
       listIssueReferenceSummary: async () => ({ outbound: [], inbound: [] }),
     }),
@@ -147,6 +160,10 @@ describe("external object routes", () => {
     mockIssueService.getById.mockResolvedValue(makeIssue());
     mockIssueService.assertCheckoutOwner.mockResolvedValue({ adoptedFromRunId: null });
     mockAccessService.hasPermission.mockResolvedValue(false);
+    mockAccessService.decide.mockImplementation(async ({ action }: { action: string }) => ({
+      allowed: action === "issue:mutate",
+      explanation: "Denied by test mock",
+    }));
     mockAgentService.list.mockResolvedValue([
       { id: ownerAgentId, companyId, reportsTo: null, permissions: { canCreateAgents: false } },
       { id: peerAgentId, companyId, reportsTo: null, permissions: { canCreateAgents: false } },

ui/src/components/CommentThread.external-references.test.tsx

@@ -63,6 +63,9 @@ describe("CommentThread external object decoration (integration)", () => {
                   issueId: "issue-1",
                   authorAgentId: null,
                   authorUserId: "user-1",
+                  authorType: "user",
+                  presentation: null,
+                  metadata: null,
                   body: [
                     "Tracked: https://github.com/example/repo/pull/77",
                     "Untracked: https://elsewhere.example.com/page",

ui/src/components/CommentThread.test.tsx

@@ -423,6 +423,9 @@ describe("CommentThread", () => {
               issueId: "issue-1",
               authorAgentId: null,
               authorUserId: "user-1",
+              authorType: "user",
+              presentation: null,
+              metadata: null,
               body: "See https://github.com/example/repo/pull/42 for context.",
               createdAt: new Date("2026-03-11T11:00:00.000Z"),
               updatedAt: new Date("2026-03-11T11:00:00.000Z"),

ui/src/components/IssueDocumentsSection.tsx

@@ -763,6 +763,7 @@ export function IssueDocumentsSection({
   }, [autosaveState, commitDraft, documentConflict, draft, markDocumentDirty, resetAutosaveState, sortedDocuments]);
 
   const documentBodyShellClassName = "mt-3";
+  const documentBodyPaddingClassName = "";
   const documentBodyContentClassName = "paperclip-edit-in-place-content min-h-[220px] text-[15px] leading-7";
   const toggleFoldedDocument = (key: string) => {
     setFoldedDocumentKeys((current) =>

ui/src/components/IssueThreadInteractionCard.tsx

@@ -1997,7 +1997,6 @@ export function IssueThreadInteractionCard({
             onAcceptInteraction={onAcceptInteraction}
             onRejectInteraction={onRejectInteraction}
             onUploadImage={onUploadImage}
-            onUploadImage={onUploadImage}
             externalReferences={externalReferences}
           />
         )}

ui/src/components/SidebarProjects.tsx

@@ -234,7 +234,6 @@ function SortableProjectItem(props: ProjectItemProps) {
     transition,
     isDragging,
   } = useSortable({ id: props.project.id });
-  } = useSortable({ id: props.project.id });
 
   return (
     <div

ui/src/pages/InstanceExperimentalSettings.test.tsx

@@ -53,6 +53,7 @@ function defaultExperimentalSettings(): InstanceExperimentalSettingsPayload {
     enableConferenceRoomChat: false,
     enableIssuePlanDecompositions: false,
     enableExperimentalFileViewer: false,
+    enableExternalObjects: false,
     enableTaskWatchdogs: false,
     enableCloudSync: false,
     autoRestartDevServerWhenIdle: false,