heyquilt 0.3.138 → 0.3.140

package/src/ui/tree.js

@@ -5,8 +5,6 @@ import { esc, I, ago, colorFor, loadingNote } from './common.js'
 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
 
 const shortAgo = (ts) => {
   const s = Math.max(0, Math.round((Date.now() - ts) / 1000))
@@ -122,14 +120,10 @@ export function renderTree (el, tree, { me, expanded, selected }) {
       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.
-      // 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 = 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)}" 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) : ''}
+        <span class="t-ico">${I.file}</span><span class="t-name">${esc(f.name)}</span>
+        ${recent && !(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

@@ -2,8 +2,7 @@
 // (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 { I, state, $, esc, basename, toast, api, ask, avatar, colorFor, ago, bytes, COLORS, loadingHtml } from './common.js'
 import { filesSectionHtml, bindFilesSection } from './files.js'
 import { memberMiniHtml, memberMenuItems, openAgentMenu } from './agent-place.js'
 
@@ -260,7 +259,7 @@ export function workspacePageHtml () {
       ${w.description ? `<p>${esc(w.description)}</p>` : ''}
       <div class="ws-statline">${running.length ? `<span class="live"><span class="dot"></span><b>${running.length}</b> open now</span>` : ''}${stat(sessionCount, 'session', 'sessions')}${stat(fileCount, 'file', 'files')}${stat(people.length + agents.length, 'person or agent', 'people and agents')}</div>
     </div>
-    <div class="acts"><button class="btn sm" data-team title="People and agents in this workspace">${I.users}<span>Team</span><span class="count">${people.length + agents.length}</span></button><button class="btn sm" data-ws-github title="GitHub for this workspace's sessions">${I.branch}<span>GitHub</span></button>${admin ? `<button class="btn sm" data-invite-ws>${I.link}<span>Invite</span></button><button class="btn sm ghost icon" data-ws-settings title="Workspace settings" aria-label="Workspace settings">${I.gear}</button>` : ''}</div>
+    <div class="acts"><button class="btn sm" data-team title="People and agents in this workspace">${I.users}<span>Team</span><span class="count">${people.length + agents.length}</span></button>${admin ? `<button class="btn sm" data-invite-ws>${I.link}<span>Invite</span></button><button class="btn sm ghost icon" data-ws-settings title="Workspace settings" aria-label="Workspace settings">${I.gear}</button>` : ''}</div>
   </header>
 
   <div class="ws-dash">
@@ -375,7 +374,6 @@ export function bindWorkspacePage (root, { go, rerender, newSessionDialog, invit
   // The team (people and agents) is a dialog from the Team button, so the page is sessions and files.
   root.querySelector('[data-team]')?.addEventListener('click', () => openTeamDialog({ id, inviteDialog, reload, rerender }))
   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]')
@@ -390,124 +388,6 @@ function usageLine (u) {
   return `<p class="hint" data-ws-usage>${esc(`${used} used · ${n} ${n === 1 ? 'file' : 'files'}`)}</p>`
 }
 
-/**
- * GitHub for a workspace (plan §2): who connected Quilt's GitHub App for it (its sessions use that before
- * their people's own, then the org's), which repositories its sessions may use, and, in an org, whether
- * the org requires GitHub. Admins change it; everyone else sees it.
- */
-let githubOpening = false
-/**
- * Git for everyone in a workspace's GitHub settings (mockup option A): the workspace's rule, and its org's
- * for org admins, each as the one segmented control. A pick saves at once, as in the session's settings.
- */
-function gitRuleCardsHtml (g, wsName) {
-  const org = g.org
-  const orgRule = org && org.agentCommits ? { by: 'org', name: org.name, mode: org.agentCommits } : null
-  const ws = gitControl({ value: g.agentCommits || '', rule: orgRule, canEdit: !!g.admin })
-  const wsPill = ws.rulePill ? `<span class="pill rule">${esc(ws.rulePill)}</span>` : org ? `<span class="pill">Org ${esc(org.name)} sets nothing</span>` : g.agentCommits ? '' : '<span class="pill">Not set</span>'
-  const clear = (scope) => `<button type="button" class="text-btn" data-git-clear="${scope}">Clear it</button>`
-  const wsHint = g.agentCommits
-    ? `A ceiling for its sessions: each owner may choose stricter. ${g.admin ? clear('workspace') : 'Clear it'} to let each session decide.`
-    : 'Nothing selected: each session\'s owner decides. A choice here is a ceiling for its sessions: each owner may choose stricter.'
-  const cards = [`<div class="pm-card git-card" data-git-scope="workspace">
-    <div class="git-head"><h4>Git for every session in ${esc(wsName)}</h4>${wsPill}</div>
-    ${gitSegHtml(ws, { attr: 'data-git-pick', label: `Git for every session in ${wsName}` })}
-    ${ws.lockedHint ? `<span class="hint">${esc(ws.lockedHint)}</span>` : ''}
-    <span class="hint">${wsHint}${g.admin ? '' : ' Its admins change this.'}</span>
-  </div>`]
-  if (org) {
-    const o = gitControl({ value: org.agentCommits || '', canEdit: !!org.admin })
-    const oHint = org.agentCommits
-      ? `A ceiling for every workspace, team and session in ${esc(org.name)}: each may choose stricter. ${org.admin ? clear('org') : 'Clear it'} to let them decide.`
-      : 'Nothing selected: its workspaces, teams and sessions decide.'
-    cards.push(`<div class="pm-card git-card" data-git-scope="org">
-    <div class="git-head"><h4>Git for every session in ${esc(org.name)}</h4><span class="pill">${org.agentCommits ? 'Org rule' : 'Not set'}</span></div>
-    ${gitSegHtml(o, { attr: 'data-git-pick', label: `Git for every session in ${org.name}` })}
-    <span class="hint">${oHint}${org.admin ? '' : ' Org admins change this.'}</span>
-  </div>`)
-  }
-  return cards.join('')
-}
-
-async function githubDialog (id, dialog) {
-  if (githubOpening || document.querySelector('.modal-back [data-gh-connect]')) return // one at a time, however often the button is clicked
-  githubOpening = true
-  let g
-  try { g = await api('GET', wsUrl(id, '/github')) } catch (err) { toast(err.message); return } finally { githubOpening = false }
-  const conn = (list, mine) => list.length
-    ? `<ul class="ws-gh-list">${list.map((c) => `<li><b>${c.login ? `@${esc(c.login)}` : 'GitHub'}</b> <span class="hint">connected by ${esc(c.name || 'someone')}${c.at ? `, ${esc(ago(c.at))}` : ''}</span>${mine && (g.admin || c.connectedBy === g.me) ? ` <button type="button" class="btn sm ghost" data-gh-remove="${esc(c.connectedBy)}">Remove</button>` : ''}</li>`).join('')}</ul>`
-    : '<p class="hint">Nobody has connected GitHub here yet.</p>'
-  const wsName = (state.workspace && state.workspace.workspace.id === id && state.workspace.workspace.name) || 'this workspace'
-  const { form, close } = dialog(`
-    <h3>GitHub for this workspace</h3>
-    <p class="hint">Sessions here use this workspace's GitHub connection first, then ${g.org ? `${esc(g.org.name)}'s` : 'their org\'s'}, then their own people's.</p>
-    <div class="field"><span class="label">This workspace</span>${conn(g.connections, true)}
-      <button type="button" class="btn sm" data-gh-connect>${I.branch}<span>Connect GitHub for this workspace</span></button></div>
-    ${g.org ? `<div class="field"><span class="label">${esc(g.org.name)}</span>${conn(g.org.connections, false)}${g.org.admin ? `<button type="button" class="btn sm" data-gh-connect-org>${I.branch}<span>Connect GitHub for ${esc(g.org.name)}</span></button>` : ''}</div>` : ''}
-    <div class="field"><span class="label">Repositories</span>
-      <label class="radio"><input type="radio" name="access" value="open" ${g.access !== 'repos' ? 'checked' : ''} ${g.admin ? '' : 'disabled'}> Any repository its people can reach</label>
-      <label class="radio"><input type="radio" name="access" value="repos" ${g.access === 'repos' ? 'checked' : ''} ${g.admin ? '' : 'disabled'}> Only these, one per line (owner/name)</label>
-      <textarea class="input" name="repos" rows="3" placeholder="acme/widgets" ${g.admin ? '' : 'disabled'}>${esc((g.repos || []).join('\n'))}</textarea></div>
-    <div class="field"><span class="label">Git for everyone</span><div class="git-cards" data-git-cards>${gitRuleCardsHtml(g, wsName)}</div></div>
-    ${g.org ? `<label class="toggle"><input type="checkbox" name="requireGithub" ${g.org.requireGithub ? 'checked' : ''} ${g.org.admin ? '' : 'disabled'}><span class="track"><span class="knob"></span></span><span class="tg-text"><b>${esc(g.org.name)} requires GitHub</b><span class="hint">An agent then gets the GitHub permissions of the person it works for, no more. ${g.org.admin ? 'An org setting: it applies to every workspace of the org.' : 'Org admins change this.'}</span></span></label>` : ''}
-    <p class="error" data-error></p>
-    <div class="actions"><span class="spacer"></span><button type="button" class="btn ghost" data-cancel>${g.admin || (g.org && g.org.admin) ? 'Cancel' : 'Close'}</button>${g.admin || (g.org && g.org.admin) ? '<button class="btn primary" type="submit">Save</button>' : ''}</div>`)
-  form.querySelector('[data-gh-connect]').onclick = async () => {
-    try {
-      const { url } = await api('POST', '/api/github/connect', { scope: 'workspace', id })
-      window.open(url, '_blank', 'noopener')
-      toast('Finish on GitHub, then open this again')
-      close()
-    } catch (err) { form.querySelector('[data-error]').textContent = err.message }
-  }
-  form.querySelector('[data-gh-connect-org]')?.addEventListener('click', async () => {
-    try {
-      const { url } = await api('POST', '/api/github/connect', { scope: 'org', id: g.org.slug })
-      window.open(url, '_blank', 'noopener')
-      toast('Finish on GitHub, then open this again')
-      close()
-    } catch (err) { form.querySelector('[data-error]').textContent = err.message }
-  })
-  form.querySelector('[data-git-cards]').addEventListener('click', async (e) => {
-    const pick = e.target.closest('[data-git-pick]')
-    const clear = e.target.closest('[data-git-clear]')
-    if (!pick && !clear) return
-    if (pick && (pick.disabled || pick.classList.contains('on'))) return
-    const scope = clear ? clear.dataset.gitClear : pick.closest('[data-git-scope]').dataset.gitScope
-    const agentCommits = clear ? '' : pick.dataset.gitPick
-    try {
-      if (scope === 'org') await api('POST', `/api/orgs/${encodeURIComponent(g.org.slug)}/github`, { agentCommits })
-      else await api('POST', wsUrl(id, '/github'), { agentCommits })
-      g = await api('GET', wsUrl(id, '/github'))
-      form.querySelector('[data-git-cards]').innerHTML = gitRuleCardsHtml(g, wsName)
-      toast(agentCommits ? AGENT_COMMIT_WORDS[agentCommits] : scope === 'org' ? 'Cleared: its workspaces and sessions decide.' : 'Cleared: each session decides.')
-    } catch (err) { form.querySelector('[data-error]').textContent = err.message }
-  })
-  form.querySelectorAll('[data-gh-remove]').forEach((b) => {
-    b.onclick = async () => {
-      try { await api('POST', wsUrl(id, '/github/disconnect'), { connectedBy: b.dataset.ghRemove }); close(); githubDialog(id, dialog) } catch (err) { form.querySelector('[data-error]').textContent = err.message }
-    }
-  })
-  form.onsubmit = async (e) => {
-    e.preventDefault()
-    const f = new FormData(form)
-    const save = form.querySelector('button[type=submit]')
-    save.disabled = true
-    try {
-      if (g.admin) {
-        const repos = String(f.get('repos') || '').split(/[\s,]+/).map((x) => x.trim()).filter(Boolean)
-        await api('POST', wsUrl(id, '/github'), { access: f.get('access') === 'repos' ? 'repos' : 'open', repos })
-      }
-      const require = f.get('requireGithub') === 'on'
-      if (g.org && g.org.admin && require !== !!g.org.requireGithub) await api('POST', `/api/orgs/${encodeURIComponent(g.org.slug)}/github`, { requireGithub: require })
-      close(); toast('Saved')
-    } catch (err) {
-      form.querySelector('[data-error]').textContent = err.message
-      save.disabled = false
-    }
-  }
-}
-
 /** `dialog(html)` is home.js's: a modal form that closes on Cancel, Escape or a click outside. */
 function settingsDialog (reload, go, dialog) {
   const w = state.workspace.workspace

package/src/ui-server.js

@@ -14,14 +14,13 @@ import { runSession, decodeInvite, encodeInvite, newConn, readConfig, recentSess
 import { MAX_SHARED_FILE_BYTES } from './protocol.js'
 import { getSettings, saveSettings, unsupportedRelay, relayUrl } from './settings.js'
 import { PICKUP_MODES, pickupMode } from './tasks.js'
-import { AGENT_COMMITS } from './github-commit.js'
 import { execFile } from 'node:child_process'
 import { installedEditors, openIn, copyToClipboard } from './editors.js'
 import { autowork, autoConfig, publicConfig, AUTO_MODES } from './autowork.js'
 import { migrateDir } from './legacy.js'
 import { writePrivateJson } from './private-file.js'
 import { autoToolFor } from './autowork-tools.js'
-import { readAccount, saveAccount, workspaceGithub, setWorkspaceGithub, removeWorkspaceGithub, setOrgGithub, clearAccount, clearAccountIf, resumeAccount, startLink, waitForLink, fetchMe, signOut, revokeToken, accountFromProfile, renameSession, createAgentInvite, listAgents, agentDetails, listAccessTypes, listCollaborators, listGrants, putGrant, deleteGrant, inviteToSession, listSessionInvites, cancelSessionInvite, listWorkspaces, listOrgs, createWorkspace, getWorkspace, updateWorkspace, deleteWorkspace, putWorkspaceMember, removeWorkspaceMember, getAgentPlacement, putAgentPlacement, listOrgAgents, putWorkspaceAgent, deleteWorkspaceAgent, createWorkspaceAgentInvite, excludeSessionAgent, listExcludedSessionAgents, listSessionAgents, includeSessionAgent, setSessionWorkspace, moveSessionToWorkspace, listWorkspaceInvites, inviteToWorkspace, cancelWorkspaceInvite, listMyInvites, answerMyInvite, announceSessionStarted, announceWhenReported, listWorkspaceFiles, createWorkspaceFile, confirmWorkspaceFile, workspaceFileDownload, updateWorkspaceFile, deleteWorkspaceFile, createWorkspaceFolder, listWorkspaceFileVersions, githubStatus, githubConnectUrl, listSandboxKeys, createSandboxKey, rotateSandboxKey, revokeSandboxKey, removeSandboxKey, aiVmFollow, aiVmUnfollow, aiVmStatus, aiVmConnect, aiVmUpdate, aiVmSignIn, aiVmWake, aiVmDisconnect, voiceIce, transcribeVoice, apiUrl } from './account.js'
+import { readAccount, saveAccount, clearAccount, clearAccountIf, resumeAccount, startLink, waitForLink, fetchMe, signOut, revokeToken, accountFromProfile, renameSession, createAgentInvite, listAgents, agentDetails, listAccessTypes, listCollaborators, listGrants, putGrant, deleteGrant, inviteToSession, listSessionInvites, cancelSessionInvite, listWorkspaces, listOrgs, createWorkspace, getWorkspace, updateWorkspace, deleteWorkspace, putWorkspaceMember, removeWorkspaceMember, getAgentPlacement, putAgentPlacement, listOrgAgents, putWorkspaceAgent, deleteWorkspaceAgent, createWorkspaceAgentInvite, excludeSessionAgent, listExcludedSessionAgents, listSessionAgents, includeSessionAgent, setSessionWorkspace, moveSessionToWorkspace, listWorkspaceInvites, inviteToWorkspace, cancelWorkspaceInvite, listMyInvites, answerMyInvite, announceSessionStarted, announceWhenReported, listWorkspaceFiles, createWorkspaceFile, confirmWorkspaceFile, workspaceFileDownload, updateWorkspaceFile, deleteWorkspaceFile, createWorkspaceFolder, listWorkspaceFileVersions, listSandboxKeys, createSandboxKey, rotateSandboxKey, revokeSandboxKey, removeSandboxKey, aiVmFollow, aiVmUnfollow, aiVmStatus, aiVmConnect, aiVmUpdate, aiVmSignIn, aiVmWake, aiVmDisconnect, voiceIce, transcribeVoice, apiUrl } from './account.js'
 import { aiName } from './persona.js'
 import { effectiveAccess, builtinType } from './session-access.js'
 import { cleanSessionName, BAD_SESSION_NAME, SESSION_NAME_MAX } from './session-name.js'
@@ -68,13 +67,9 @@ function profile () {
     shareAgent: s.shareAgent !== false,
     summarize: !!s.summarize,
     preferLocal: !!s.preferLocal,
-    // Quilt pushes your local commits for you on branches that sync with GitHub: off unless you turn it on.
-    pushLocalCommits: s.pushLocalCommits === true,
     theme: THEMES.includes(s.theme) ? s.theme : 'dark', // dark unless you pick another
     report: s.report !== false,
     aiTasks: pickupMode(s.aiTasks),
-    // What agents may commit in sessions you start ('off', 'branches', 'any'); each session's owner can change it there.
-    agentCommits: AGENT_COMMITS.includes(s.agentCommits) ? s.agentCommits : 'branches',
     // When work comes to your AI (autowork.js): 'chat', 'open' or 'auto', with its model, files and daily cap.
     auto: publicConfig(autoConfig(s)),
     // Sounds (src/ui/sounds.js): each on unless switched off.
@@ -99,7 +94,6 @@ function updateProfile (b) {
   if ('shareAgent' in b) patch.shareAgent = b.shareAgent ? undefined : false
   if ('summarize' in b) patch.summarize = b.summarize ? true : undefined
   if ('preferLocal' in b) patch.preferLocal = b.preferLocal ? true : undefined
-  if ('pushLocalCommits' in b) patch.pushLocalCommits = b.pushLocalCommits ? true : undefined
   if ('theme' in b) {
     if (!THEMES.includes(b.theme)) throw httpError(400, 'Pick Light, Dark or System.')
     patch.theme = b.theme === 'dark' ? undefined : b.theme
@@ -109,10 +103,6 @@ function updateProfile (b) {
     if (!PICKUP_MODES.includes(b.aiTasks)) throw httpError(400, 'Pick Off, Assigned to it, or Assigned and unassigned.')
     patch.aiTasks = b.aiTasks === 'off' ? undefined : b.aiTasks
   }
-  if ('agentCommits' in b) {
-    if (!AGENT_COMMITS.includes(b.agentCommits)) throw httpError(400, 'Pick Not at all, To branches of their own, or To any branch.')
-    patch.agentCommits = b.agentCommits === 'branches' ? undefined : b.agentCommits
-  }
   if ('autoWork' in b) {
     if (!AUTO_MODES.includes(b.autoWork)) throw httpError(400, 'Pick Leave it for my chat, Open it in my tool, or Work on its own.')
     patch.autoWork = b.autoWork === 'chat' ? undefined : b.autoWork
@@ -480,8 +470,6 @@ export async function startUi ({ port = 7420, onShutdown, preview = false, repor
         apiAuth: personApiAuth,
         // A new session is named after its folder (the owner can rename it later).
         startName: mode === 'create' ? cleanSessionName([...path.basename(dir)].slice(0, SESSION_NAME_MAX).join('')) || '' : '',
-        // Your default for what agents may commit, set on the new room once the relay makes you its owner.
-        startAgentCommits: mode === 'create' ? me.agentCommits : '',
         // A new session is a quilt from the start when the API says so (quilt-default.js).
         newSession: mode === 'create',
         workspace: workspace || '',
@@ -935,15 +923,7 @@ export async function startUi ({ port = 7420, onShutdown, preview = false, repor
       return { ok: true }
     },
     'GET /api/access-types': () => asAccount(async (token) => ({ types: await listAccessTypes({ token }) })),
-    // Quilt's GitHub App: whether this account connected GitHub, and the link that connects it (opened in the browser).
     ...cloudRoutes,
-    'GET /api/github': () => asAccount(async (token) => githubStatus({ token })),
-    'POST /api/github/connect': (b) => asAccount(async (token) => ({ url: await githubConnectUrl({ token, repo: b && b.repo, ...(b && ['workspace', 'org'].includes(b.scope) ? { scope: b.scope, id: String(b.id || '') } : {}) }) })),
-    // GitHub for a workspace (plan §2): its connections, access mode, and its org's Require GitHub.
-    'GET /api/workspaces/:id/github': (b, id) => asAccount(async (token) => workspaceGithub({ token, id: needWorkspaceId(id) })),
-    'POST /api/workspaces/:id/github': (b, id) => asAccount(async (token) => setWorkspaceGithub({ token, id: needWorkspaceId(id), ...('access' in b ? { access: String(b.access || ''), repos: Array.isArray(b.repos) ? b.repos.map(String) : [] } : {}), ...('agentCommits' in b ? { agentCommits: String(b.agentCommits || '') } : {}) })),
-    'POST /api/workspaces/:id/github/disconnect': (b, id) => asAccount(async (token) => removeWorkspaceGithub({ token, id: needWorkspaceId(id), connectedBy: b && b.connectedBy ? String(b.connectedBy) : '' })),
-    'POST /api/orgs/:slug/github': (b, slug) => asAccount(async (token) => setOrgGithub({ token, slug: String(slug || ''), ...(b && 'requireGithub' in b ? { requireGithub: b.requireGithub === true } : {}), ...(b && 'agentCommits' in b ? { agentCommits: String(b.agentCommits || '') } : {}) })),
     'GET /api/collaborators': () => asAccount(async (token) => ({ collaborators: await listCollaborators({ token }) })),
     'GET /api/sessions/:id/grants': (b, id) => { const s = owned(id); return asAccount(async (token) => ({ grants: await listGrants({ token, room: s.room }) })) },
     'POST /api/sessions/:id/members/access': (b, id) => setAccess(id, b),
@@ -1040,7 +1020,6 @@ export async function startUi ({ port = 7420, onShutdown, preview = false, repor
     }),
     'POST /api/sessions': (b) => start(b),
     'POST /api/sessions/:id/open-in': async (b, id) => { await openIn(String(b.app || ''), get(id).root); return { ok: true } },
-    'GET /api/sessions/:id/merges': (b, id) => ({ merges: get(id).mergeList() }),
     // Gathering the project's AI rules into AGENTS.md (project-rules.js): look first, then apply what was shown.
     'GET /api/sessions/:id/rules/gather': (b, id) => get(id).rulesGatherPlan(),
     'POST /api/sessions/:id/rules/gather': (b, id) => get(id).applyRulesGather(String(b.key || '')),
@@ -1115,10 +1094,8 @@ export async function startUi ({ port = 7420, onShutdown, preview = false, repor
     'GET /api/sessions/:id/blame': (b, id, url) => get(id).quiltBlame(String(url.searchParams.get('path') || '')),
     'GET /api/sessions/:id/patch': (b, id, url) => get(id).quiltShow(String(url.searchParams.get('commit') || ''), String(url.searchParams.get('path') || '')),
     'GET /api/sessions/:id/search': (b, id, url) => get(id).quiltSearch(String(url.searchParams.get('q') || '')),
-    // Commits pushed or merged elsewhere: fetch and bring them in now (they also come in by themselves).
     // In a session that moved into Seam: the square panel's Commit and Merge onto main, as this member (control.js seamTool).
     'POST /api/sessions/:id/seam': (b, id) => squareTool(get(id), b),
-    'POST /api/sessions/:id/branches/sync': async (b, id) => { const r = await get(id).syncBranchNow(); pushStatus(id); return r },
     'GET /api/sessions/:id/file': (b, id, url) => {
       const f = get(id).readShared(url.searchParams.get('path'))
       if (!f) throw httpError(404, 'That file is not in this session.')
@@ -1131,8 +1108,6 @@ export async function startUi ({ port = 7420, onShutdown, preview = false, repor
     },
     'POST /api/sessions/:id/members/deny': async (b, id) => (await admitter(id).deny(b.key), { ok: true }),
     'POST /api/sessions/:id/admit-by': async (b, id) => (await owned(id).setAdmitBy(b.admitBy), { ok: true, admitBy: b.admitBy }),
-    // Owner only: the read-only GitHub token the relay brings commits in with while everyone's offline ('' clears it).
-    'POST /api/sessions/:id/github-token': (b, id) => owned(id).setGithubToken(b.token),
     'POST /api/sessions/:id/members/set': async (b, id) => (await get(id).setMember(b.key, { role: b.role, scopes: b.scopes }), { ok: true }),
     'POST /api/sessions/:id/members/remove': (b, id) => removeMember(id, b.key),
     // Owner only: a link a chat-only AI (ChatGPT, claude.ai, Grok…) works through (chat-links.js).
@@ -1201,20 +1176,8 @@ export async function startUi ({ port = 7420, onShutdown, preview = false, repor
     'GET /api/github/status': () => { throw httpError(410, GITHUB_GONE) },
     'GET /api/github/repos': () => { throw httpError(410, GITHUB_GONE) },
     'GET /api/github/branches': () => { throw httpError(410, GITHUB_GONE) },
-    'POST /api/sessions/:id/commit-request': (b, id) => { const r = get(id).requestCommit(b.message, { files: Array.isArray(b.files) ? b.files : null, task: b.task || null, by: b.by ? String(b.by).slice(0, 80) : null }); pushStatus(id); return r },
-    // Commits a request in this folder (commit.js), and what is not committed here yet, by who made it.
-    'POST /api/sessions/:id/commit-session': async (b, id) => { try { return await get(id).commitSessionWork(String(b.message || ''), { mine: b.mine === true }) } finally { pushStatus(id) } },
-    'POST /api/sessions/:id/commit-request/commit': async (b, id) => { try { return await get(id).commitRequest(String(b.id || '')) } finally { pushStatus(id) } },
-    'POST /api/sessions/:id/agent-commits': async (b, id) => { try { return await get(id).setAgentCommits(b.mode) } finally { pushStatus(id) } },
     // "Make this a quilt" (Seam's plans 16, flag 9): the owner's button. The relay makes the session a quilt and moves it into its squares, as the owner.
     'POST /api/sessions/:id/quilt-make': async (b, id) => { try { return await get(id).quiltMake(process.env.SEAM_TOKEN || (readAccount() || {}).token) } finally { pushStatus(id) } },
-    'POST /api/sessions/:id/github-sync': async (b, id) => { try { return await get(id).setGithubSync(b.on !== false) } finally { pushStatus(id) } },
-    'POST /api/sessions/:id/large-to-relay': async (b, id) => { try { return await get(id).setLargeToRelay(b.on === true) } finally { pushStatus(id) } },
-    'POST /api/sessions/:id/github/recheck': async (b, id) => { try { return { github: await get(id).githubRecheck() } } finally { pushStatus(id) } },
-    'GET /api/sessions/:id/uncommitted': (b, id) => get(id).uncommittedWork(),
-    // The git panel: your own work not committed here (yours and your AIs'), each boxed or not.
-    'GET /api/sessions/:id/mine-uncommitted': (b, id) => get(id).myUncommitted(),
-    'POST /api/sessions/:id/commit-request/done': (b, id) => { const done = get(id).resolveCommitRequests({ ids: b.id ? [String(b.id)] : null }); pushStatus(id); return { done } },
     'GET /api/fs': (b, id, url) => listDir(url.searchParams.get('path') || os.homedir()),
     // Reply first, then shut down, so the page hears back before we exit.
     'POST /api/shutdown': () => {