@@ -12,6 +12,7 @@ import { useRouter } from 'next/navigation'
 import { CHAT_PLAN_REQUIRED_UPGRADE } from '@/lib/billing/chat-plan'
 import { rememberSettingsReturnUrl } from '@/lib/navigation/settings-return'
 import { usePlanUpgradeLink } from '@/app/workspace/[workspaceId]/home/hooks/use-plan-upgrade-link'
+import { useOptionalWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
 import { useChatPlanModalStore } from '@/stores/modals/chat-plan/store'
 
 /**
@@ -20,7 +21,8 @@ import { useChatPlanModalStore } from '@/stores/modals/chat-plan/store'
  * leaving the shell closes it, so a refusal never reopens in the next workspace or organization.
  */
 export function ChatPlanModal() {
-  const isOpen = useChatPlanModalStore((state) => state.isOpen)
+  const workspaceId = useOptionalWorkspaceHostContext()?.workspace.id
+  const isOpen = useChatPlanModalStore((state) => state.workspaceId === workspaceId)
   const close = useChatPlanModalStore((state) => state.close)
 
   useEffect(() => close, [close])
 
@@ -533,7 +533,7 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
 
   const handleSubmit = useCallback(() => {
     if (chatPlanRequired) {
-      useChatPlanModalStore.getState().open()
+      useChatPlanModalStore.getState().open(workspaceId)
       return
     }
     const currentFiles = filesRef.current
@@ -561,7 +561,7 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
     )
     if (accepted === false) return
     clearComposer()
-  }, [chatPlanRequired, onSubmit, clearComposer])
+  }, [chatPlanRequired, workspaceId, onSubmit, clearComposer])
 
   /**
    * Enter policy for the editor: mirror canSubmit's uploading guard (Enter
 
@@ -4443,7 +4443,7 @@ export function useChat(
     ) => {
       if ((!message.trim() && !fileAttachments?.length) || !scopeKey) return
       if (chatPlanRequired) {
-        useChatPlanModalStore.getState().open()
+        useChatPlanModalStore.getState().open(workspaceId)
         return
       }
 
@@ -5307,7 +5307,7 @@ export function useChat(
       if (!msg || queueState.editing[chatKey] === msg.id) return
       if (queuedMessageDispatchIds.has(msg.id)) return
       if (chatPlanRequired) {
-        useChatPlanModalStore.getState().open()
+        useChatPlanModalStore.getState().open(workspaceId)
         return
       }
       /* Sent by hand, it still must not run a second turn: if the history shows it
 
@@ -327,10 +327,15 @@ async function throwIfRunTimedOut(
   if (!result.timedOut) return
   if (!run.lease.session) throw new DOMException('timeout', 'AbortError')
   const { outputSandboxDir, sandbox } = run
+  // Half of what the call has left, so the report lands before the call's deadline.
+  const listingMs = Math.min(
+    TIMED_OUT_OUTPUT_LISTING_MS,
+    (getRemainingExecutionMs(run.signal) ?? Number.POSITIVE_INFINITY) / 2
+  )
   const listed = outputSandboxDir
     ? await withinDeadline(
         () => sandbox.listFiles(outputSandboxDir, { depth: SANDBOX_OUTPUT_DIR_MAX_DEPTH }),
-        Date.now() + TIMED_OUT_OUTPUT_LISTING_MS,
+        Date.now() + listingMs,
         run.signal
       ).catch(() => [])
     : []
@@ -908,21 +913,32 @@ function installBudgetMs(timeoutMs: number): number {
  */
 const MIN_EXPORT_BUDGET_MS = 10_000
 
+/**
+ * Held back from a workbench run without an export reserve, capped at a quarter of its budget,
+ * so the run's own timeout answers and reports its progress before the call's deadline.
+ */
+const MAX_TIMEOUT_REPORT_BUDGET_MS = 4_000
+
 /**
  * The budget handed to user code, less an export reserve when this request will
  * read files back. Short budgets are left alone: taking the reserve out of one
- * would starve the code to buy time for an export it never reaches.
+ * would starve the code to buy time for an export it never reaches. A workbench
+ * run, whose timeout reports progress, still keeps a smaller report reserve.
  */
 function codeBudgetMs(
   req: { outputSandboxPath?: string; outputSandboxPaths?: string[]; outputSandboxDir?: string },
-  signal: AbortSignal
+  signal: AbortSignal,
+  reportsTimeout: boolean
 ): number {
   const remainingMs = remainingSandboxBudgetMs(signal)
   const exportsFiles = Boolean(
     req.outputSandboxDir || req.outputSandboxPath || req.outputSandboxPaths?.length
   )
-  if (!exportsFiles || remainingMs <= MIN_EXPORT_BUDGET_MS * 2) return remainingMs
-  return remainingMs - MIN_EXPORT_BUDGET_MS
+  if (exportsFiles && remainingMs > MIN_EXPORT_BUDGET_MS * 2) {
+    return remainingMs - MIN_EXPORT_BUDGET_MS
+  }
+  if (!reportsTimeout) return remainingMs
+  return remainingMs - Math.min(MAX_TIMEOUT_REPORT_BUDGET_MS, Math.floor(remainingMs / 4))
 }
 
 /**
@@ -1060,7 +1076,7 @@ async function executeInSandboxWithinBudget(
         signal,
         phases,
         (verifyCli) => {
-          runTimeoutMs = codeBudgetMs(req, signal)
+          runTimeoutMs = codeBudgetMs(req, signal, Boolean(lease.session))
           return sandbox.runCode(code, {
             timeoutMs: runTimeoutMs,
             javascriptPreload: buildJavaScriptRuntimeBindingsSource(req.runtimeBindings ?? []),
@@ -1283,7 +1299,7 @@ async function executeShellInSandboxWithinBudget(
         signal,
         phases,
         (verifyCli) => {
-          runTimeoutMs = codeBudgetMs(req, signal)
+          runTimeoutMs = codeBudgetMs(req, signal, Boolean(lease.session))
           return sandbox.runCommand(code, {
             envs: commandEnvironment,
             timeoutMs: runTimeoutMs,
 
@@ -1130,6 +1130,43 @@ describe('session sandbox lease', () => {
       }
     })
 
+    it('reports the output of a short run whose own timeout answers after a round trip', async () => {
+      vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'Date'] })
+      try {
+        const { handle } = fakeSandbox('timeout-short')
+        mockFindSessionSandbox.mockResolvedValue(handle)
+        // The provider answers its own timeout one round trip late, and stops on the call's abort.
+        handle.runCommand = (_command, options) =>
+          new Promise((resolve, reject) => {
+            const timer = setTimeout(
+              () => resolve({ stdout: 'step 1', stderr: '', exitCode: 124, timedOut: true }),
+              (options?.timeoutMs ?? 0) + 300
+            )
+            options?.signal?.addEventListener('abort', () => {
+              clearTimeout(timer)
+              reject(options.signal?.reason)
+            })
+          })
+        handle.listFiles = () => new Promise<never>(() => {})
+        const pending = executeShellInSandbox({
+          ...CODE_REQUEST,
+          timeoutMs: 10_000,
+          envs: {},
+          session: { key: 'timeout-short' },
+          outputSandboxDir: OUTPUT_DIR,
+        }).then(
+          () => undefined,
+          (rejection: unknown) => rejection
+        )
+        await vi.runAllTimersAsync()
+        const error = await pending
+        if (!(error instanceof SandboxExecutionTimeoutError)) throw error
+        expect(error.progress.output).toBe('step 1')
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+
     it('keeps a cancellation that arrives while listing the outputs a cancellation', async () => {
       const { handle } = fakeSandbox('timeout-cancelled')
       mockFindSessionSandbox.mockResolvedValue(handle)
 
@@ -1,4 +1,5 @@
 import type { OrganizationDelegatedPrincipal } from '@sim/auth/principal'
+import { featureFlagsMock, featureFlagsMockFns } from '@sim/testing/mocks/feature-flags.mock'
 import {
   knowledgeAvailabilityMock,
   knowledgeAvailabilityMockFns,
@@ -11,6 +12,7 @@ vi.mock('@/lib/settings/application/organization-section-access', () => ({
   authorizeOrganizationSettingsSection: sectionAccess,
 }))
 vi.mock('@/lib/knowledge/access/availability', () => knowledgeAvailabilityMock)
+vi.mock('@/lib/core/config/feature-flags', () => featureFlagsMock)
 vi.mock('@/lib/mothership/application/settings-context', () => ({
   resolveSettingsContext: resolve,
 }))
@@ -98,6 +100,27 @@ describe('settings tool dispatch', () => {
     })
   })
 
+  it('offers Sim links only to an organization that has them enabled', async () => {
+    const simLinks = expect.objectContaining({ id: 'sim-links' })
+    featureFlagsMockFns.mockIsFeatureEnabled.mockResolvedValue(false)
+    expect(
+      await settingsServerTool.execute({ scope: 'organization', action: 'list' })
+    ).not.toMatchObject({ sections: expect.arrayContaining([simLinks]) })
+    for (const action of ['open', 'get'] as const) {
+      await expect(
+        settingsServerTool.execute({ scope: 'organization', action, section: 'sim-links' })
+      ).rejects.toThrow('unavailable')
+    }
+
+    featureFlagsMockFns.mockIsFeatureEnabled.mockImplementation(
+      async (flag, context) =>
+        flag === 'sim-links' && (context as { orgId?: string })?.orgId === 'org'
+    )
+    expect(
+      await settingsServerTool.execute({ scope: 'organization', action: 'list' })
+    ).toMatchObject({ sections: expect.arrayContaining([simLinks]) })
+  })
+
   it('discovers names without eagerly reading every setting or dumping every schema', async () => {
     const read = vi.spyOn(readOrganizationSettings, 'execute')
     const result = await settingsServerTool.execute({ scope: 'organization', action: 'list' })
 
@@ -87,6 +87,8 @@ interface SettingAdapter {
   get(context: SettingsContext): Promise<unknown>
   schema?: z.ZodType
   update?(context: SettingsContext, changes: Record<string, unknown>): Promise<unknown>
+  /** Whether the section exists for this target at all; a section that does not is never listed. */
+  available?(context: SettingsContext): Promise<boolean>
 }
 
 function organizationInput(context: SettingsContext) {
@@ -255,7 +257,10 @@ const adapters: Record<string, SettingAdapter> = {
   },
   'organization/members': { get: readSettingsRoster },
   'organization/requests': { get: (context) => readSettingsAccessRequests(context) },
-  'organization/sim-links': { get: (context) => readSettingsSimLinks(context) },
+  'organization/sim-links': {
+    available: (context) => isSimLinksEnabled(organizationInput(context).organizationId),
+    get: (context) => readSettingsSimLinks(context),
+  },
   'organization/whitelabeling': {
     schema: updateOrganizationWhitelabelBodySchema.strict(),
     get: async (context) =>
@@ -322,6 +327,7 @@ async function describeSection(context: SettingsContext, section: SettingsSectio
   )
     return null
   const adapter = adapters[`${context.scope}/${section.id}`]
+  if (adapter?.available && !(await adapter.available(context))) return null
   const uiSection =
     context.scope === 'organization' &&
     section.id === 'connected-accounts' &&
 
@@ -2,22 +2,23 @@ import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
 
 interface ChatPlanModalState {
-  isOpen: boolean
-  open: () => void
+  /** The workspace whose refused send opened the modal; another workspace never shows it. */
+  workspaceId: string | null
+  open: (workspaceId: string | undefined) => void
   close: () => void
 }
 
 /**
- * Whether the Chat plan modal is showing. A send the payer's plan refuses opens it from wherever
- * the send started (the composer, a queued message, a handoff from another surface), and the
- * workspace shell renders the one modal.
+ * Which workspace's Chat plan modal is showing. A send the payer's plan refuses opens it from
+ * wherever the send started (the composer, a queued message, a handoff from another surface), and
+ * the workspace shell renders the one modal, only for the workspace that opened it.
  */
 export const useChatPlanModalStore = create<ChatPlanModalState>()(
   devtools(
     (set) => ({
-      isOpen: false,
-      open: () => set({ isOpen: true }),
-      close: () => set({ isOpen: false }),
+      workspaceId: null,
+      open: (workspaceId) => set({ workspaceId: workspaceId ?? null }),
+      close: () => set({ workspaceId: null }),
     }),
     { name: 'chat-plan-modal-store' }
   )