heyquilt 0.3.90 → 0.3.107

package/src/ui/session.js

@@ -1,6 +1,7 @@
 // The session workspace: file tree on the left; in the middle the Loom (everyone's
 // AI conversations at once), one person's AI chat, a shared file or the task board;
 // the team chat on the right.
+import { mountSecrets } from './secrets.js'
 import { TOKEN, I, state, $, esc, basename, bytes, clock, ago, avatar, colorFor, toast, api, ask, remember, recall, AGENT_COMMIT_WORDS, toolsOf, busyPeople, NO_POSTING, ACCOUNT_KEY, loadAccessTypes, typeOptions, accessLine, loadingHtml, loadingNote } from './common.js'
 import { openInvite, renderTabs, markRead, go } from './app.js'
 import { renderFeed } from './feed.js'
@@ -18,7 +19,6 @@ import { openSettings } from './home.js'
 import { fileCardHref, renderable, textHtml, mentionAt, mentionCandidates, completeMention, ALL_AGENTS, RELAY_NAME, isRelay, relayPrompts, typingNames, typingHtml, TYPING_MS, foldPersonas, aiOwners, aiName, shownName, ownAiChatter } from './chat.js'
 import { renderBoard, taskNotesModalHtml, openTaskMenu, foldPlan, matchesSearch } from './board.js'
 import { accessFormValues, accessSaveBody, grantsLoading, grantsLoaded, grantsFailed } from './access-form.js'
-import { bindMerges, renderMergeView } from './merges.js'
 import { workspaceFilePicker } from './files.js'
 import { sessionAgentsHtml } from './agent-place.js'
 import { renderCatchUp, bindCatchUp } from './catchup.js'
@@ -39,7 +39,7 @@ let boxView = { id: null, sig: null, at: 0, loading: false, data: { on: false, b
 const BOXES_FRESH_MS = 3000 // while the panel is open, a box's change is fetched again at most this often
 
 // ------------------------------------------------------------ layout state --
-// Per session: mode ('ai' | 'files' | 'merge'), open tabs per mode, expanded folders.
+// Per session: mode ('ai' | 'files'), open tabs per mode, expanded folders.
 function ws (id) {
   if (!state.ws.has(id)) {
     let saved = null
@@ -52,7 +52,6 @@ function ws (id) {
       fileTabs: [],
       fileSel: null,
       fileTab: {}, // file path -> 'changes' when its Changes tab is shown (absent: the file)
-      mergeSel: null, // merge id shown in the compare view
       expanded: {},
       treeCollapsed: true, // the Files pane starts folded into its rail (rail.js)
       stale: {}, // file path -> changed while not visible
@@ -160,7 +159,6 @@ export function mountSession (id) {
         <div class="pane-head">
           <button type="button" class="tree-collapse wide-tree" id="collapse-tree" title="Collapse files" aria-expanded="true" aria-controls="tree">${I.arrowLeft}</button>
           <span class="pane-title">Files</span><span class="hint" id="file-count"></span>
-          <button type="button" class="merge-pill" id="merge-filter" aria-pressed="false" title="Show only the files to merge" hidden></button>
         </div>
         <div class="tree-rail" id="tree-rail" role="toolbar" aria-orientation="vertical" aria-label="Locks"></div>
         <div class="tree-scroll" id="tree"></div>
@@ -200,7 +198,6 @@ export function mountSession (id) {
 
   bindTop()
   bindAccess()
-  bindMerges($('#main'), { sessionId: () => current, onCompare: openMerge, editors: mergeEditors })
   bindChanges(id, mounted.signal, { onOpen: (path) => openFile(path, { tab: 'changes' }), close: () => setGitOpen(false), onCount: renderGitChip })
   bindCatchUp($('#catchup'), { sessionId: () => current, onOpen: openFile })
   bindGithubCard()
@@ -232,8 +229,6 @@ export function mountSession (id) {
       setTimeout(() => cover.remove(), 300)
     })
   }
-  const shown = ws(id).mode === 'merge' && shownMerge()
-  if (shown && !shown.binary) refreshFile(shown.path, false) // the cached copy may be from before
   loadNewPeople(id)
   // Relative times ("4s ago") and recent-edit badges age out.
   timers.push(setInterval(() => { renderTreePane(); renderTop() }, 15000))
@@ -305,7 +300,6 @@ export function sessionFileChanged (id, { path }) {
   scheduleTree()
   changesChanged()
   const w = ws(id)
-  if (w.mode === 'merge' && shownMerge()?.path === path) refreshFile(path, false)
   if (w.fileTabs.includes(path)) {
     if (w.mode === 'files' && w.fileSel === path) { refreshFile(path, true); scheduleHistory(path) } else { w.stale[path] = true; histories.delete(fileKey(path)); renderMainBar() }
   }
@@ -327,13 +321,6 @@ function editorsByPreference () {
   return mine ? [mine, ...all.filter((e) => e !== mine)] : all
 }
 
-/** The merge bar's apps: your AI on its own first when you turned that on (Settings → Your AI), then the apps. */
-function mergeEditors () {
-  const a = state.profile?.auto
-  const apps = editorsByPreference()
-  return a && a.mode === 'auto' && a.supported ? [{ id: 'auto', name: 'your AI', auto: true }, ...apps] : apps
-}
-
 function openInMarkup () {
   const [first, ...rest] = editorsByPreference()
   if (!first) return ''
@@ -680,7 +667,6 @@ function renderTop () {
   renderAccess()
   renderCatchUp($('#catchup'), st.catchUp, { colors: new Map([st.me, ...st.peers].map((p) => [p.name, p.color])) })
   renderGithubCard()
-  renderMerges()
   renderGitChip()
   $('#rename-btn').hidden = !st.access?.owner
   $('#move-ws-btn').hidden = !(st.access?.owner && state.workspacesOn && (state.workspaces || []).some((w) => w.access === 'edit'))
@@ -1169,66 +1155,6 @@ async function moveToWorkspace () {
   } catch (err) { toast(err.message) }
 }
 
-// ----------------------------------------------------------------- merges --
-const isViewer = () => { const a = sum().status.access || {}; return !!(a.controlled && a.role === 'viewer') }
-const shownMerge = () => (sum().status.merges || []).find((m) => m.id === ws(current).mergeSel) || null
-
-// Status carries merge records without their texts; the compare view fetches
-// the full record once. Keyed by session, id and state: ours and base never
-// change for a record, but "edit by hand" and settling change its state.
-const mergeTexts = new Map() // `${session}\n${id}\n${state}` -> { ours, base } | 'loading'
-const mergeKey = (sid, m) => `${sid}\n${m.id}\n${m.state}`
-
-/** The shown merge's ours and base, or undefined while they load. */
-function fullMerge (m) {
-  const sid = current
-  const got = mergeTexts.get(mergeKey(sid, m))
-  if (got && got !== 'loading') return got
-  if (got) return undefined
-  mergeTexts.set(mergeKey(sid, m), 'loading')
-  api('GET', `/api/sessions/${sid}/merges`).then((r) => {
-    for (const full of r.merges || []) mergeTexts.set(mergeKey(sid, full), { ours: full.ours ?? null, base: full.base ?? null })
-    if (mergeTexts.get(mergeKey(sid, m)) === 'loading') mergeTexts.set(mergeKey(sid, m), { ours: null, base: null }) // gone meanwhile
-    if (current === sid && ws(sid).mode === 'merge') renderMain()
-  }).catch(() => {
-    mergeTexts.set(mergeKey(sid, m), { ours: null, base: null }) // shown as not available, not refetched on every status
-    if (current === sid && ws(sid).mode === 'merge') renderMain()
-  })
-  return undefined
-}
-
-/** Files to merge, marked in the tree, and the compare view when it's showing (it only redraws on a change). */
-let lastMergeSig = ''
-function renderMerges () {
-  if (!current || !sum()) return
-  const merges = sum().status.merges || []
-  const w = ws(current)
-  // The tree marks the files to merge: drawn again only when they change.
-  const sig = JSON.stringify(merges.filter((m) => m.state !== 'done').map((m) => [m.id, m.path, m.heldBy || '']))
-  if (sig !== lastMergeSig) { lastMergeSig = sig; renderTreePane() }
-  if (w.mode !== 'merge' || !w.mergeSel) return
-  // The same file can conflict again after its record was settled: the compare
-  // tab then follows the new open record instead of showing the old one.
-  const shown = merges.find((m) => m.id === w.mergeSel)
-  if (shown && shown.state === 'done') {
-    const next = merges.find((m) => m.path === shown.path && m.state !== 'done')
-    if (next) { w.mergeSel = next.id; saveWs(current); renderMainBar() }
-  }
-  renderMain()
-}
-
-function openMerge (id) {
-  const w = ws(current)
-  w.mergeSel = id
-  w.mode = 'merge'
-  saveWs(current)
-  renderMainBar()
-  renderMain()
-  renderTreePane()
-  // Always fetch: a cached copy may be from before the session moved on.
-  const m = shownMerge()
-  if (m && !m.binary) refreshFile(m.path, false)
-}
 
 /** Is member `m` an agent (a chat link is one too)? */
 const isAgentMember = (m) => m.kind === 'agent' || !!m.chat
@@ -1560,15 +1486,20 @@ const SS_TABS = [
   { id: 'chat', label: 'Your AI chat', icon: 'chat' },
   { id: 'vc', label: 'Version control', icon: 'branch' },
   { id: 'agents', label: 'Agents', icon: 'bot' },
-  { id: 'people', label: 'People', icon: 'users' }
+  { id: 'people', label: 'People', icon: 'users' },
+  // Secrets (secrets.js): only once the accounts API has them switched on.
+  { id: 'secrets', label: 'Secrets', icon: 'lock', on: () => state.secretsOn }
 ]
+const ssTabs = () => SS_TABS.filter((x) => !x.on || x.on())
+// The Secrets tab's card while it is drawn: kept across redraws of the window, so a typed name isn't lost.
+let ssSecrets = null
 let ssTab = 'chat'
 
 function openSessionSettings (tab) {
   document.querySelector('.session-settings-back')?.remove()
   $('#people-menu').hidden = true
   $('#people-btn').setAttribute('aria-expanded', 'false')
-  if (tab && SS_TABS.some((t) => t.id === tab)) ssTab = tab
+  if (tab && ssTabs().some((t) => t.id === tab)) ssTab = tab
   const back = document.createElement('div')
   back.className = 'modal-back top session-settings-back'
   back.innerHTML = `<div class="card modal session-settings" role="dialog" aria-modal="true" aria-labelledby="ss-title">
@@ -1597,8 +1528,9 @@ function openSessionSettings (tab) {
   back.querySelector('.ss-tabs').addEventListener('keydown', (e) => {
     if (e.key !== 'ArrowDown' && e.key !== 'ArrowUp') return
     e.preventDefault()
-    const i = SS_TABS.findIndex((t) => t.id === ssTab)
-    ssTab = SS_TABS[(i + (e.key === 'ArrowDown' ? 1 : SS_TABS.length - 1)) % SS_TABS.length].id
+    const i = ssTabs().findIndex((t) => t.id === ssTab)
+    const list = ssTabs()
+    ssTab = list[(i + (e.key === 'ArrowDown' ? 1 : list.length - 1)) % list.length].id
     renderSessionSettings({ force: true })
     back.querySelector(`[data-ss-tab="${ssTab}"]`)?.focus()
   })
@@ -1621,7 +1553,7 @@ function renderSessionSettings ({ force = false } = {}) {
   const st = sum().status
   // The list is drawn once (a redraw under a click would lose it); here only which is on, and the counts.
   const tabs = back.querySelector('.ss-tabs')
-  if (!tabs.children.length) tabs.innerHTML = SS_TABS.map((t) => `<button type="button" role="tab" class="ss-tab" data-ss-tab="${t.id}">${I[t.icon]}<span>${t.label}</span><span class="ss-count"></span></button>`).join('')
+  if (!tabs.children.length) tabs.innerHTML = ssTabs().map((t) => `<button type="button" role="tab" class="ss-tab" data-ss-tab="${t.id}">${I[t.icon]}<span>${t.label}</span><span class="ss-count"></span></button>`).join('')
   for (const b of tabs.children) {
     const on = b.dataset.ssTab === ssTab
     b.classList.toggle('on', on)
@@ -1630,7 +1562,17 @@ function renderSessionSettings ({ force = false } = {}) {
     b.querySelector('.ss-count').textContent = ssCount(st, b.dataset.ssTab)
   }
   box.dataset.tab = ssTab
-  back.querySelector('.ss-name').textContent = SS_TABS.find((t) => t.id === ssTab).label
+  back.querySelector('.ss-name').textContent = (ssTabs().find((t) => t.id === ssTab) || ssTabs()[0]).label
+  if (ssTab === 'secrets') {
+    const room = st.room
+    const mounted = box.querySelector(`[data-secrets-room="${CSS.escape(String(room || ''))}"]`)
+    if (mounted && !force) return
+    ssSecrets?.destroy()
+    box.innerHTML = `<div class="ss-secrets" data-secrets-room="${esc(room || '')}"></div>`
+    ssSecrets = mountSecrets(box.firstElementChild, { type: 'session', id: room, importFrom: { sessionId: current } })
+    return
+  }
+  if (ssSecrets) { ssSecrets.destroy(); ssSecrets = null }
   // Don't redraw under the owner while they change someone's access (unless fresh grants
   // arrived: then the form is redrawn from them, and keeps its focus).
   const active = box.contains(document.activeElement) && document.activeElement.closest('.pm-member') ? document.activeElement : null
@@ -1649,17 +1591,6 @@ function bindMain () {
     const close = e.target.closest('[data-close]')
     const tab = e.target.closest('[data-tab]')
     const w = ws(current)
-    if (close && close.dataset.kind === 'merge') {
-      e.stopPropagation()
-      w.mergeSel = null
-      if (w.mode === 'merge') w.mode = w.fileSel ? 'files' : 'ai'
-      saveWs(current)
-      renderMainBar()
-      renderMain()
-      renderTreePane()
-      return
-    }
-    if (tab && tab.dataset.kind === 'merge') { openMerge(tab.dataset.tab); return }
     if (tab && tab.dataset.kind === 'loom') { openLoom(); return }
     if (close) {
       e.stopPropagation()
@@ -1779,20 +1710,10 @@ function renderMainBar () {
   }).join('') + (w.fileTabs.length ? '<span class="ws-tab-sep"></span>' : '') +
   w.fileTabs.map((path) => `<div class="ws-tab${fileOn(path) ? ' on' : ''}" role="tab" aria-selected="${fileOn(path)}" tabindex="0" data-kind="file" data-tab="${esc(path)}" title="${esc(path)}">
       <span class="ico">${I.file}</span><span class="nm">${esc(basename(path))}</span>${w.stale[path] ? '<span class="changed" title="Changed"></span>' : ''}
-      <button class="x" data-kind="file" data-close="${esc(path)}" aria-label="Close ${esc(basename(path))}">${I.x}</button></div>`).join('') +
-  (w.mergeSel ? mergeTabHtml(w) : '')
+      <button class="x" data-kind="file" data-close="${esc(path)}" aria-label="Close ${esc(basename(path))}">${I.x}</button></div>`).join('')
   // On Everyone with nothing else open, the row would only name the view you are in: hide it until
   // there is a tab to switch to (or, on the Tasks board, Everyone to go back to).
-  $('#mainbar').hidden = loomOn && !w.aiTabs.length && !w.fileTabs.length && !w.mergeSel
-}
-
-function mergeTabHtml (w) {
-  const m = shownMerge()
-  const on = w.mode === 'merge'
-  const name = m ? `Merge ${basename(m.path)}` : 'Merge'
-  return `<span class="ws-tab-sep"></span><div class="ws-tab${on ? ' on' : ''}" role="tab" aria-selected="${on}" tabindex="0" data-kind="merge" data-tab="${esc(w.mergeSel)}" title="${esc(m ? `Compare the two versions of ${m.path}` : 'Merge')}">
-      <span class="ico">${I.branch}</span><span class="nm">${esc(name)}</span>
-      <button class="x" data-kind="merge" data-close="${esc(w.mergeSel)}" aria-label="Close merge">${I.x}</button></div>`
+  $('#mainbar').hidden = loomOn && !w.aiTabs.length && !w.fileTabs.length
 }
 
 // A card being renamed, or a drag in progress, must not be rebuilt under the pointer.
@@ -2420,17 +2341,7 @@ function renderMain () {
     </div>`
     return
   }
-  if (w.mode === 'merge' && !w.mergeSel) w.mode = 'ai'
-  if (w.mode === 'merge') {
-    const m = shownMerge()
-    const cached = m ? state.files.get(fileKey(m.path)) : null
-    const f = cached && cached.file
-    const theirs = !cached ? undefined : f.missing || f.binary ? null : f.text
-    const texts = m && !m.binary ? fullMerge(m) : { ours: null, base: null }
-    renderMergeView(el, { merge: m, texts, theirs, me: me(), editors: mergeEditors(), viewer: isViewer() })
-    if (m && !m.binary && !cached) refreshFile(m.path, false)
-    return
-  }
+  if (w.mode === 'merge') w.mode = 'ai' // a compare tab from before Quilt merged on its own
   if (w.mode === 'ai') {
     if (!w.aiSel) {
       const people = st.peers
@@ -2467,6 +2378,7 @@ function renderMain () {
       return
     }
     const cached = state.files.get(fileKey(w.fileSel))
+    if (!cached) loadFileOnce(w.fileSel) // a tab put back after a reload has nothing read yet
     renderFileView(el, {
       path: w.fileSel,
       file: cached ? cached.file : null,
@@ -2476,7 +2388,8 @@ function renderMain () {
       tab: fileTabOf(w.fileSel),
       history: histories.get(fileKey(w.fileSel)) || null,
       summary: fileChanges(w.fileSel),
-      people: { who: (name) => name === me() ? 'you' : name, colorOf: (name) => personInfo(name).color }
+      people: { who: (name) => name === me() ? 'you' : name, colorOf: (name) => personInfo(name).color },
+      chatHref: treeMeta(w.fileSel)?.chat ? fileCardHref(current, treeMeta(w.fileSel).chat.id, TOKEN) : null
     })
     if (cached && fileTabOf(w.fileSel) === 'file') cached.prevText = null // highlight once, on the File tab
   }
@@ -2528,6 +2441,14 @@ function treeMeta (path) {
   return { path, edited: null, claim: null }
 }
 
+const fileLoads = new Set() // fileKey -> being read for the first time
+function loadFileOnce (path) {
+  const key = fileKey(path)
+  if (fileLoads.has(key)) return
+  fileLoads.add(key)
+  refreshFile(path, false).finally(() => fileLoads.delete(key))
+}
+
 async function refreshFile (path, highlight) {
   const id = current
   const key = fileKey(path)
@@ -2542,7 +2463,7 @@ async function refreshFile (path, highlight) {
   if (id !== current) return
   state.files.set(key, { file, prevText })
   const w = ws(current)
-  if ((w.mode === 'files' && w.fileSel === path) || (w.mode === 'merge' && shownMerge()?.path === path)) renderMain()
+  if (w.mode === 'files' && w.fileSel === path) renderMain()
 }
 
 // ------------------------------------------------------------------ Loom --
@@ -2667,7 +2588,8 @@ async function loadTree () {
     if (w.mode === 'files' && w.fileSel) {
       // Keep the banner (editor, claim) fresh without re-highlighting.
       const cached = state.files.get(fileKey(w.fileSel))
-      if (cached) renderFileView($('#main'), { path: w.fileSel, file: cached.file, meta: treeMeta(w.fileSel), me: me(), bannerOnly: true })
+      const meta = treeMeta(w.fileSel)
+      if (cached) renderFileView($('#main'), { path: w.fileSel, file: cached.file, meta, me: me(), bannerOnly: true, chatHref: meta?.chat ? fileCardHref(id, meta.chat.id, TOKEN) : null })
     }
   } catch {}
 }
@@ -2678,20 +2600,10 @@ function renderTreePane () {
   const w = ws(current)
   const tree = state.trees.get(current)
   const scroll = el.scrollTop
-  const merges = (sum()?.status.merges || []).filter((m) => m.state !== 'done')
-  if (!merges.length) w.mergesOnly = false
-  const shown = w.mode === 'merge' ? merges.find((m) => m.id === w.mergeSel)?.path : null
-  renderTree(el, tree, { me: me(), expanded: w.expanded, selected: w.mode === 'files' ? w.fileSel : shown || null, merges, mergesOnly: !!w.mergesOnly })
+  renderTree(el, tree, { me: me(), expanded: w.expanded, selected: w.mode === 'files' ? w.fileSel : null })
   el.scrollTop = scroll
-  $('#file-count').textContent = tree ? `${tree.files.length}` : ''
-  const pill = $('#merge-filter')
-  if (pill) {
-    pill.hidden = !merges.length
-    pill.innerHTML = `<span class="mp-n">${merges.length}</span><span class="mp-l">to merge</span>`
-    pill.setAttribute('aria-pressed', String(!!w.mergesOnly))
-    pill.title = w.mergesOnly ? 'Show every file' : 'Show only the files to merge'
-  }
-  renderRailPane(tree, merges)
+  $('#file-count').textContent = tree ? `${tree.files.filter((f) => !f.chat).length}` : ''
+  renderRailPane(tree)
   // The rows were replaced: keep the card on the one still under the pointer, with fresh numbers.
   if (cardPath) {
     const row = treeRow(cardPath)
@@ -2817,25 +2729,21 @@ function openTaskNotes (task, { instant = false } = {}) {
   if (instant) back.querySelector('.task-comment-text').focus()
 }
 
-/** The folded Files pane: locks and who holds them (rail.js); a merge in a file you have open marks the merge pill. */
-function renderRailPane (tree = state.trees.get(current), merges = sum()?.status.merges || []) {
+/** The folded Files pane: locks and who holds them (rail.js). */
+function renderRailPane (tree = state.trees.get(current)) {
   const el = $('#tree-rail')
   const s = sum()
   if (!el || !s) return
   const st = s.status
-  const w = ws(current)
   const model = railModel({
     claims: st.claims || [],
-    merges,
     me: st.me.name,
     owners: owners(s),
     aiName,
     files: tree ? tree.files.map((f) => f.path) : [],
-    open: [...w.fileTabs, ...(w.mergeSel ? [merges.find((m) => m.id === w.mergeSel)?.path] : [])].filter(Boolean),
     focusOf: (name) => (name === st.me.name ? st.me.focus : st.peers.find((p) => p.name === name)?.focus) || '',
     kindOf: (name) => personInfo(name).kind
   })
-  $('#merge-filter')?.classList.toggle('urgent', model.merges.urgent)
   renderRail(el, model, { me: st.me.name, colorOf: (name) => personInfo(name).color, onFile: (path) => openFile(path) })
 }
 
@@ -2958,15 +2866,6 @@ function bindChatPane () {
 function bindTreeEvents () {
   const collapse = $('#collapse-tree')
   if (collapse) collapse.onclick = () => toggleTreeCollapsed()
-  const filter = $('#merge-filter')
-  if (filter) {
-    filter.onclick = () => {
-      const w = ws(current)
-      if (w.treeCollapsed) { w.mergesOnly = true; toggleTreeCollapsed() } else w.mergesOnly = !w.mergesOnly
-      saveWs(current)
-      renderTreePane()
-    }
-  }
   const el = $('#tree')
   el.addEventListener('click', (e) => {
     const more = e.target.closest('[data-more]')
@@ -2984,8 +2883,7 @@ function bindTreeEvents () {
       return
     }
     const file = e.target.closest('[data-file]')
-    if (file && file.dataset.merge) openMerge(file.dataset.merge) // changed in two places: both versions, side by side
-    else if (file) openFile(file.dataset.file)
+    if (file) openFile(file.dataset.file)
   })
   el.addEventListener('contextmenu', (e) => {
     const row = e.target.closest('[data-file],[data-dir]')

package/src/ui/tree.js

@@ -1,6 +1,9 @@
 // The shared project's file tree: who edited what recently, what's claimed.
 import { esc, I, ago, colorFor, loadingNote } from './common.js'
 
+/** Where each person's chat files are kept (CHAT_FILES in pathrules.js, which the page can't load). */
+export const CHAT_FILES = 'Chat files'
+
 export const RECENT_MS = 2 * 60 * 1000
 /** How long a file brought in from GitHub keeps its GitHub badge (an edit in the session takes it away sooner). */
 export const GITHUB_BADGE_MS = 10 * 60 * 1000
@@ -76,15 +79,10 @@ function hasRecent (node, me) {
  * @param {{ files: object[], claims: object[] }} tree
  * @param {{ me: string, expanded: object, selected: string|null }} view
  */
-export function renderTree (el, tree, { me, expanded, selected, merges = [], mergesOnly = false }) {
+export function renderTree (el, tree, { me, expanded, selected }) {
   if (!tree) { el.innerHTML = `<div class="empty-note" style="padding:12px 14px">${loadingNote('Loading files…')}</div>`; return }
-  // Files to merge are marked where they are; one the session deleted is listed all the same.
-  const mergeOf = new Map(merges.map((m) => [m.path, m]))
-  const known = new Set(tree.files.map((f) => f.path))
-  let files = [...tree.files, ...merges.filter((m) => !known.has(m.path)).map((m) => ({ path: m.path }))]
-  if (mergesOnly) files = files.filter((f) => mergeOf.has(f.path))
+  const files = tree.files
   if (!files.length) { el.innerHTML = '<div class="empty-note" style="padding:12px 14px">No shared files yet.</div>'; return }
-  const mergesIn = (dir) => merges.filter((m) => m.path.startsWith(`${dir}/`)).length
   const folderClaims = new Map()
   for (const c of tree.claims) folderClaims.set(claimFolder(c.pattern), c)
   const root = buildTree(files)
@@ -97,34 +95,41 @@ export function renderTree (el, tree, { me, expanded, selected, merges = [], mer
   // Who just edited a file: a button to its Changes tab. Its +/− shows in the row's change card.
   const editBadge = (f, byOther) => `<button type="button" class="t-badge ${byOther ? 'edit' : 'mine'}" data-changes="${esc(f.path)}" aria-label="See what changed in ${esc(f.path)}">${esc(f.edited.by === me ? 'you' : f.edited.by)} · ${shortAgo(f.edited.ts)}</button>`
   const walk = (node, depth) => {
-    const dirs = [...node.dirs.values()].sort((a, b) => a.name.localeCompare(b.name))
+    const dirs = [...node.dirs.values()].sort((a, b) => (a.path === CHAT_FILES) - (b.path === CHAT_FILES) || a.name.localeCompare(b.name)) // chat files last
     for (const d of dirs) {
-      const open = mergesOnly || (expanded[d.path] ?? depth === 0)
+      const open = expanded[d.path] ?? depth === 0
       const claim = folderClaims.get(d.path)
-      const inside = open ? 0 : mergesIn(d.path)
+      // The chat files folder (session.js): each person's own copy of what was sent in chat, nothing to claim.
+      if (d.path === CHAT_FILES) {
+        rows.push(`<div class="t-row t-dir t-chat" role="treeitem" aria-expanded="${open}" tabindex="-1" data-dir="${esc(d.path)}" style="--depth:${depth}" title="Files sent in this session's chat. Only people in the session get them; never synced or committed.">
+          <span class="t-caret${open ? ' open' : ''}">${I.caret}</span><span class="t-name">${esc(d.name)}</span><span class="t-badge chat">${I.lock}session only</span></div>`)
+        if (open) walk(d, depth + 1)
+        continue
+      }
       rows.push(`<div class="t-row t-dir" role="treeitem" aria-expanded="${open}" tabindex="-1" data-dir="${esc(d.path)}" style="--depth:${depth}">
         <span class="t-caret${open ? ' open' : ''}">${I.caret}</span><span class="t-name">${esc(d.name)}</span>
-        ${inside ? `<span class="t-badge merge" title="${inside} file${inside === 1 ? '' : 's'} to merge inside">${inside}</span>` : ''}
         ${!open && hasRecent(d, me) ? '<span class="t-dot" title="Recently edited inside"></span>' : ''}${claim ? claimBadge(claim) : !open ? insideBadge(claimsInside(tree.claims, d.path), me) : ''}
         <button class="t-more" data-more="${esc(d.path)}" data-kind="dir" aria-label="More for ${esc(d.name)}">${I.more}</button></div>`)
       if (open) walk(d, depth + 1)
     }
     for (const f of node.files.sort((a, b) => a.name.localeCompare(b.name))) {
+      if (f.chat) {
+        rows.push(`<div class="t-row t-file${selected === f.path ? ' on' : ''}" role="treeitem" tabindex="-1" data-file="${esc(f.path)}" style="--depth:${depth}" title="${esc(`Sent in chat by ${f.chat.by === me ? 'you' : f.chat.by}${f.chat.to ? ` to ${f.chat.to === me ? 'you' : f.chat.to}` : ''}`)}">
+          <span class="t-ico">${I.file}</span><span class="t-name">${esc(f.name)}</span><span class="t-badge chat">${esc(f.chat.by === me ? 'you' : f.chat.by)}</span></div>`)
+        continue
+      }
       const recent = !!f.edited && Date.now() - f.edited.ts < RECENT_MS
       const byOther = recent && f.edited.by !== me
       const ownClaim = f.claim && claimFolder(f.claim.pattern) === f.path ? f.claim : null
       // The holder of a claim is the one editing it: their claim badge says so, one badge is enough on a narrow row.
-      // A file to merge says so instead of who last edited it.
-      const m = mergeOf.get(f.path)
-      const mergeBadge = m ? `<span class="t-badge merge" title="${esc(m.heldBy && m.heldBy !== me ? `${m.heldBy} is merging it` : 'Changed in two places: open it to compare and settle')}">${m.heldBy && m.heldBy !== me ? esc(m.heldBy) : 'merge'}</span>` : ''
       // GitHub's version, not edited in the session since: GitHub's commit takes the "who edited" place, for ten
       // minutes after it came in (an older relay doesn't say when: then after the commit).
-      const gh = !m && f.github && Date.now() - (f.github.came || f.github.at || 0) < GITHUB_BADGE_MS ? f.github : null
+      const gh = f.github && Date.now() - (f.github.came || f.github.at || 0) < GITHUB_BADGE_MS ? f.github : null
       const ghBadge = gh ? `<span class="t-badge gh" title="${esc(`From GitHub: ${gh.sha.slice(0, 7)}${gh.by ? ` by ${gh.by}` : ''}${gh.subject ? `: ${gh.subject}` : ''}. Not edited in the session since.`)}">${I.github}<span class="t-gh">${esc(gh.by || 'GitHub')}${gh.at ? ` · ${shortAgo(gh.at)}` : ''}</span></span>` : ''
       const ghost = ownClaim && ownClaim.box && !boxMine(ownClaim)
-      rows.push(`<div class="t-row t-file${selected === f.path ? ' on' : ''}${ghost ? ' ghost' : ''}" role="treeitem" tabindex="-1" data-file="${esc(f.path)}"${m ? ` data-merge="${esc(m.id)}"` : ''} style="--depth:${depth}" title="${esc(f.path)}">
-        <span class="t-ico">${I.file}</span><span class="t-name">${esc(f.name)}</span>${mergeBadge}${ghBadge}
-        ${recent && !m && !gh && !(ownClaim && ownClaim.by === f.edited.by) ? editBadge(f, byOther) : ''}
+      rows.push(`<div class="t-row t-file${selected === f.path ? ' on' : ''}${ghost ? ' ghost' : ''}" role="treeitem" tabindex="-1" data-file="${esc(f.path)}" style="--depth:${depth}" title="${esc(f.path)}">
+        <span class="t-ico">${I.file}</span><span class="t-name">${esc(f.name)}</span>${ghBadge}
+        ${recent && !gh && !(ownClaim && ownClaim.by === f.edited.by) ? editBadge(f, byOther) : ''}
         ${claimBadge(ownClaim)}
         <button class="t-more" data-more="${esc(f.path)}" data-kind="file" aria-label="More for ${esc(f.name)}">${I.more}</button></div>`)
     }

package/src/ui/workspaces.js

@@ -1,6 +1,7 @@
 // Workspaces: the home grid of cards, the Add workspace card, and a workspace's page
 // (Sessions, Files, People & agents, Settings). Sessions stay in session.js; the file library
 // (the Files section, All files and uploads) is files.js.
+import { mountSecrets } from './secrets.js'
 import { I, state, $, esc, basename, toast, api, ask, avatar, colorFor, ago, bytes, COLORS, loadingHtml, AGENT_COMMIT_WORDS } from './common.js'
 import { gitControl, gitSegHtml } from './git-rule.js'
 import { filesSectionHtml, bindFilesSection } from './files.js'
@@ -276,6 +277,7 @@ export function workspacePageHtml () {
           : `<p class="hint ws-empty">No sessions yet.${d.access.access === 'edit' ? ' Start one with New session: it opens a folder of yours here.' : ''}</p>`}
       </section>
       ${filesSectionHtml(d)}
+      ${state.secretsOn ? '<section class="sec ws-secrets" data-ws-secrets></section>' : ''}
     </div>
   </div>
   </div>`
@@ -375,6 +377,9 @@ export function bindWorkspacePage (root, { go, rerender, newSessionDialog, invit
   root.querySelector('[data-ws-settings]')?.addEventListener('click', () => settingsDialog(reload, go, dialog))
   root.querySelector('[data-ws-github]')?.addEventListener('click', () => githubDialog(id, dialog))
   bindFilesSection(root, { id, reload, go })
+  // Secrets: the workspace's, with its team's above (secrets.js); .env files come from its sessions on this computer.
+  const sec = root.querySelector('[data-ws-secrets]')
+  if (sec) mountSecrets(sec, { type: 'workspace', id, importFrom: { workspaceId: id } })
 }
 
 /** "1.2 GB of 5.0 GB used · 34 files", from the workspace's usage; nothing without one. */