Merge branch 'main' into test/update-probe-same

Author: github-actions[bot]

changes/435.fixed.md

@@ -0,0 +1,3 @@
+**A request waiting for your approval no longer reads as if it already happened.** A click waiting for your
+answer showed a line like "Clicked using browser_click" under it. Now the card says only what Sentient would do,
+in plain words.

changes/456.fixed.md

@@ -0,0 +1 @@
+**Deleting a memory no longer removes what Sentient knows from a similar one.** Before, deleting "drives a red Honda City" could also take the MEMORY.md line, journal lines and user model evidence of "sold her red Honda City and now rides a blue Ather". Now only the deleted memory's own lines and evidence go.

changes/458.security.md

@@ -0,0 +1,3 @@
+**An older chat never shows a newer screen capture or file.** A shared window, selected text or file could get the
+name of one that was deleted, so an older chat showed the new, unrelated picture. Every capture now gets its own name,
+and a chat whose attachment is gone says "No longer available".

desktop/src/features/chat/ApprovalCard.tsx

@@ -29,8 +29,8 @@ import type { ApprovalDecision } from '@/lib/types'
 import { cn, humanize, truncate } from '@/lib/utils'
 import { ActionPreview } from './ActionPreview'
 import { hostOf, refLabel } from './cards/bits'
-import { toolMeta } from './toolMeta'
-import { approvalCardReason, resolveWording, type RiskLabel } from './approvalRisk'
+import { askingLabel } from './toolMeta'
+import { approvalCardReason, resolveWording, waitingSmallPrint, type RiskLabel } from './approvalRisk'
 
 const STATUS_TEXT: Partial<Record<ApprovalView['status'], string>> = {
   allow: 'You allowed this once',
@@ -152,7 +152,6 @@ export function ApprovalCard({
   onRespond?: (approvalId: string, decision: ApprovalDecision) => void
 }) {
   const risk = effectiveRisk(approval)
-  const meta = toolMeta(approval.name)
 
   if (approval.status !== 'pending') {
     const allowed = approval.status !== 'deny' && approval.status !== 'expired'
@@ -193,11 +192,7 @@ export function ApprovalCard({
     (command && 'It runs on this computer with your permissions, in this folder:') ||
     purpose ||
     reason ||
-    (meta.done ? (
-      <>
-        {meta.done} using <span className="font-mono text-xs">{approval.name}</span>
-      </>
-    ) : null)
+    waitingSmallPrint(action, askingLabel(approval.name))
 
   return (
     <motion.div

desktop/src/features/chat/UserMessage.tsx

@@ -1,6 +1,7 @@
-import { IconCheck, IconCopy, IconFile, IconPhoto, IconPlayerStop } from '@tabler/icons-react'
+import { IconCheck, IconCopy, IconFile, IconFileOff, IconPhoto, IconPhotoOff, IconPlayerStop } from '@tabler/icons-react'
 import { memo, useState } from 'react'
 import { Button, IconButton } from '@/components/ui'
+import { useFileExists } from '@/hooks/core'
 import { api } from '@/lib/api'
 import type { AttachmentView, UserMessageView } from '@/lib/chatFold'
 import { cn, copyText, formatBytes } from '@/lib/utils'
@@ -15,10 +16,29 @@ export function AttachmentChip({ a, className }: { a: AttachmentView; className?
   const image = isImageAttachment(a)
   const src = a.previewUrl ?? (image ? api.files.contentUrl(a.name) : undefined)
   const base = a.name.split('/').pop() ?? a.name
-  if (image && src) {
+  // an attachment from the chat's history can be gone (deleted, or it went with an incognito chat): say so (#458)
+  const [failed, setFailed] = useState(false)
+  const exists = useFileExists(a.name, !!a.saved && (!image || failed))
+  if (exists.data === false) {
+    return (
+      <div
+        className={cn('flex h-11 max-w-60 items-center gap-2.5 rounded-xl border border-dashed border-border px-3', className)}
+        title={base}
+      >
+        <div className="flex size-7 shrink-0 items-center justify-center rounded-md bg-sunken text-fg-subtle">
+          {image ? <IconPhotoOff size={15} /> : <IconFileOff size={15} />}
+        </div>
+        <div className="min-w-0">
+          <div className="truncate text-xs font-medium text-fg-muted">{base}</div>
+          <div className="text-2xs text-fg-subtle">No longer available</div>
+        </div>
+      </div>
+    )
+  }
+  if (image && src && !failed) {
     return (
       <div className={cn('overflow-hidden rounded-xl border border-border bg-sunken', className)} title={base}>
-        <img src={src} alt={base} className="h-28 max-w-56 object-cover" />
+        <img src={src} alt={base} className="h-28 max-w-56 object-cover" onError={() => setFailed(true)} />
       </div>
     )
   }

desktop/src/features/chat/approvalRisk.ts

@@ -313,3 +313,13 @@ export function approvalCardReason(reason?: string | null, badgeLabel?: string |
   }
   return trimmed
 }
+
+/**
+ * The small print of a waiting approval card that has no reason of its own. Nothing has happened yet, so never
+ * past tense and never the tool's developer name: nothing when the action line above already says what will happen
+ * ("Click “Subscribe”"), else the tool's plain "would" wording ("Would write file", "Would use Gmail: send email").
+ */
+export function waitingSmallPrint(actionLine?: string | null, would?: string | null): string | null {
+  if (actionLine?.trim()) return null
+  return would?.trim() || null
+}

desktop/src/features/chat/toolMeta.ts

@@ -47,55 +47,56 @@ interface ToolMeta {
   would?: string
 }
 
-const KNOWN: Record<string, ToolMeta> = {
-  memory_recall: { running: 'Searching memory', done: 'Searched memory', icon: IconBrain },
-  memory_search: { running: 'Searching memory', done: 'Searched memory', icon: IconBrain },
+/** Every tool the window names; each has a `would` line for waiting approvals and try runs (tests/approvalRisk.test.ts). */
+export const KNOWN: Record<string, ToolMeta> = {
+  memory_recall: { running: 'Searching memory', done: 'Searched memory', icon: IconBrain, would: 'Would search memory' },
+  memory_search: { running: 'Searching memory', done: 'Searched memory', icon: IconBrain, would: 'Would search memory' },
   memory_save: { running: 'Saving to memory', done: 'Saved to memory', icon: IconBrain, would: 'Would save to memory' },
   memory_remember: { running: 'Saving to memory', done: 'Saved to memory', icon: IconBrain, would: 'Would save to memory' },
   memory_add: { running: 'Saving to memory', done: 'Saved to memory', icon: IconBrain, would: 'Would save to memory' },
   memory_forget: { running: 'Forgetting', done: 'Forgot', icon: IconBrain, would: 'Would forget' },
-  memory_search_history: { running: 'Searching past chats', done: 'Searched past chats', icon: IconHistory },
-  memory_search_by_source: { running: 'Searching memory', done: 'Searched memory', icon: IconBrain },
-  history_semantic_search: { running: 'Searching past chats', done: 'Searched past chats', icon: IconHistory },
-  history_time_search: { running: 'Looking back in time', done: 'Looked back in time', icon: IconHistory },
-  current_datetime: { running: 'Checking the date and time', done: 'Checked the date and time', icon: IconClock },
-  file_list: { running: 'Listing files', done: 'Listed files', icon: IconFolder },
-  file_read: { running: 'Reading file', done: 'Read file', icon: IconFile },
+  memory_search_history: { running: 'Searching past chats', done: 'Searched past chats', icon: IconHistory, would: 'Would search past chats' },
+  memory_search_by_source: { running: 'Searching memory', done: 'Searched memory', icon: IconBrain, would: 'Would search memory' },
+  history_semantic_search: { running: 'Searching past chats', done: 'Searched past chats', icon: IconHistory, would: 'Would search past chats' },
+  history_time_search: { running: 'Looking back in time', done: 'Looked back in time', icon: IconHistory, would: 'Would look back in time' },
+  current_datetime: { running: 'Checking the date and time', done: 'Checked the date and time', icon: IconClock, would: 'Would check the date and time' },
+  file_list: { running: 'Listing files', done: 'Listed files', icon: IconFolder, would: 'Would list files' },
+  file_read: { running: 'Reading file', done: 'Read file', icon: IconFile, would: 'Would read a file' },
   file_write: { running: 'Writing file', done: 'Wrote file', icon: IconFilePencil, would: 'Would write file' },
-  folder_search: { running: 'Searching your notes', done: 'Searched your notes', icon: IconNotebook },
-  folder_read: { running: 'Reading a note', done: 'Read a note', icon: IconNotebook },
-  time_now: { running: 'Checking the time', done: 'Checked the time', icon: IconClock },
-  current_time: { running: 'Checking the time', done: 'Checked the time', icon: IconClock },
-  skill_view: { running: 'Opening skill', done: 'Opened skill', icon: IconSparkles },
+  folder_search: { running: 'Searching your notes', done: 'Searched your notes', icon: IconNotebook, would: 'Would search your notes' },
+  folder_read: { running: 'Reading a note', done: 'Read a note', icon: IconNotebook, would: 'Would read a note' },
+  time_now: { running: 'Checking the time', done: 'Checked the time', icon: IconClock, would: 'Would check the time' },
+  current_time: { running: 'Checking the time', done: 'Checked the time', icon: IconClock, would: 'Would check the time' },
+  skill_view: { running: 'Opening skill', done: 'Opened skill', icon: IconSparkles, would: 'Would open a skill' },
   skill_save: { running: 'Saving a skill', done: 'Saved a skill', icon: IconSparkles, would: 'Would save a skill' },
-  skill_list: { running: 'Listing skills', done: 'Listed skills', icon: IconSparkles },
-  web_search: { running: 'Searching the web', done: 'Searched the web', icon: IconWorld },
+  skill_list: { running: 'Listing skills', done: 'Listed skills', icon: IconSparkles, would: 'Would list skills' },
+  web_search: { running: 'Searching the web', done: 'Searched the web', icon: IconWorld, would: 'Would search the web' },
   // §10-13 code, helpers, browser and devices
   execute_code: { running: 'Running code', done: 'Ran code', icon: IconTerminal2, would: 'Would run code' },
   terminal_run: { running: 'Running a command', done: 'Ran a command', icon: IconTerminal2, would: 'Would run a command' },
   delegate_task: { running: 'Asking a helper', done: 'Asked a helper', icon: IconUserBolt, would: 'Would ask a helper' },
   delegate_tasks: { running: 'Asking helpers', done: 'Asked helpers', icon: IconUsersGroup, would: 'Would ask helpers' },
-  read_with_reader: { running: 'Reading it with a safe reader', done: 'Read it with a safe reader', icon: IconShieldSearch },
-  browser_open: { running: 'Opening a page', done: 'Opened a page', icon: IconWorldWww },
-  browser_snapshot: { running: 'Reading the page', done: 'Read the page', icon: IconListDetails },
+  read_with_reader: { running: 'Reading it with a safe reader', done: 'Read it with a safe reader', icon: IconShieldSearch, would: 'Would read it with a safe reader' },
+  browser_open: { running: 'Opening a page', done: 'Opened a page', icon: IconWorldWww, would: 'Would open a page' },
+  browser_snapshot: { running: 'Reading the page', done: 'Read the page', icon: IconListDetails, would: 'Would read the page' },
   browser_click: { running: 'Clicking', done: 'Clicked', icon: IconPointer, would: 'Would click' },
   browser_type: { running: 'Typing', done: 'Typed', icon: IconKeyboard, would: 'Would type' },
   browser_select: { running: 'Choosing an option', done: 'Chose an option', icon: IconListDetails, would: 'Would choose an option' },
   browser_press: { running: 'Pressing a key', done: 'Pressed a key', icon: IconKeyboard, would: 'Would press a key' },
-  browser_scroll: { running: 'Scrolling', done: 'Scrolled', icon: IconArrowsVertical },
-  browser_back: { running: 'Going back', done: 'Went back', icon: IconArrowBackUp },
-  browser_tabs: { running: 'Checking tabs', done: 'Checked tabs', icon: IconAppWindow },
-  browser_switch_tab: { running: 'Switching tabs', done: 'Switched tabs', icon: IconAppWindow },
-  browser_extract: { running: 'Reading the page', done: 'Read the page', icon: IconListDetails },
-  browser_screenshot: { running: 'Taking a screenshot', done: 'Took a screenshot', icon: IconScreenshot },
-  browser_close: { running: 'Closing the browser', done: 'Closed the browser', icon: IconWorld },
-  device_list: { running: 'Checking your devices', done: 'Checked your devices', icon: IconDevices },
-  device_take_photo: { running: 'Taking a photo', done: 'Took a photo', icon: IconCamera },
-  device_capture_screen: { running: 'Looking at the screen', done: 'Looked at the screen', icon: IconScreenshot },
-  device_get_location: { running: 'Finding your location', done: 'Found your location', icon: IconMapPin },
-  device_notify: { running: 'Sending a notification', done: 'Sent a notification', icon: IconBellRinging },
-  device_display: { running: 'Showing it on your device', done: 'Showed it on your device', icon: IconDevices },
-  device_speak: { running: 'Speaking on your device', done: 'Spoke on your device', icon: IconSpeakerphone }
+  browser_scroll: { running: 'Scrolling', done: 'Scrolled', icon: IconArrowsVertical, would: 'Would scroll' },
+  browser_back: { running: 'Going back', done: 'Went back', icon: IconArrowBackUp, would: 'Would go back' },
+  browser_tabs: { running: 'Checking tabs', done: 'Checked tabs', icon: IconAppWindow, would: 'Would check tabs' },
+  browser_switch_tab: { running: 'Switching tabs', done: 'Switched tabs', icon: IconAppWindow, would: 'Would switch tabs' },
+  browser_extract: { running: 'Reading the page', done: 'Read the page', icon: IconListDetails, would: 'Would read the page' },
+  browser_screenshot: { running: 'Taking a screenshot', done: 'Took a screenshot', icon: IconScreenshot, would: 'Would take a screenshot' },
+  browser_close: { running: 'Closing the browser', done: 'Closed the browser', icon: IconWorld, would: 'Would close the browser' },
+  device_list: { running: 'Checking your devices', done: 'Checked your devices', icon: IconDevices, would: 'Would check your devices' },
+  device_take_photo: { running: 'Taking a photo', done: 'Took a photo', icon: IconCamera, would: 'Would take a photo' },
+  device_capture_screen: { running: 'Looking at the screen', done: 'Looked at the screen', icon: IconScreenshot, would: 'Would look at the screen' },
+  device_get_location: { running: 'Finding your location', done: 'Found your location', icon: IconMapPin, would: 'Would find your location' },
+  device_notify: { running: 'Sending a notification', done: 'Sent a notification', icon: IconBellRinging, would: 'Would send a notification' },
+  device_display: { running: 'Showing it on your device', done: 'Showed it on your device', icon: IconDevices, would: 'Would show it on your device' },
+  device_speak: { running: 'Speaking on your device', done: 'Spoke on your device', icon: IconSpeakerphone, would: 'Would speak on your device' }
 }
 
 const PREFIX: Array<[RegExp, Icon]> = [
@@ -138,6 +139,12 @@ export function wouldLabel(name: string): string {
   return `Would use ${meta.done}`
 }
 
+/** What a waiting approval says the call would do, in plain words; null for a known tool without such wording
+ * (its past-tense label would read "Would use Checked the date and time"). */
+export function askingLabel(name: string): string | null {
+  return KNOWN[name] && !KNOWN[name].would ? null : wouldLabel(name)
+}
+
 export function toolMeta(name: string): ToolMeta {
   const known = KNOWN[name]
   if (known) return known

desktop/src/hooks/core.ts

@@ -170,6 +170,11 @@ export function useFiles() {
   return useQuery({ queryKey: qk.files, queryFn: api.files.list })
 }
 
+/** Whether an attachment's file is still there (#458); only asked when `enabled`. */
+export function useFileExists(name: string, enabled: boolean) {
+  return useQuery({ queryKey: qk.fileExists(name), queryFn: () => api.files.exists(name), enabled, staleTime: 60_000 })
+}
+
 export function useTools() {
   return useQuery({ queryKey: qk.tools, queryFn: api.tools.list, staleTime: 5 * 60_000 })
 }

desktop/src/hooks/queryKeys.ts

@@ -91,6 +91,7 @@ export const qk = {
   usage: (days: number) => ['usage', days] as const,
   usageCost: ['usage', 'cost'] as const,
   files: ['files'] as const,
+  fileExists: (name: string) => ['files', 'exists', name] as const,
   tools: ['tools'] as const,
 
   /** The activity timeline (§21). Invalidated by most domain events (lib/events.ts). */

desktop/src/lib/api.ts

@@ -523,6 +523,16 @@ export const api = {
     list: () => http.get<FileEntry[]>('/api/files'),
     contentUrl: (name: string) => authedUrl(`/api/files/content/${encPath(name)}`),
     download: (name: string) => http.blob('GET', `/api/files/content/${encPath(name)}`),
+    /** False when the file is gone (deleted, or went with an incognito chat), so a chat never shows another file (#458). */
+    exists: async (name: string) => {
+      try {
+        await send('HEAD', `/api/files/content/${encPath(name)}`)
+        return true
+      } catch (err) {
+        if (err instanceof ApiError && err.status === 404) return false
+        throw err
+      }
+    },
     delete: (name: string) => http.delete<OkResponse>(`/api/files/${encPath(name)}`)
   },