prts-terrarchive 0.2.0 → 0.2.2

package/lib/client.js

@@ -248,6 +248,7 @@ window.__ModuleLoader__.load({
       '--dsw-alias-button-ghost-active-hover': canonical('rgba(17,18,20,.13)'),
       '--dsw-alias-button-info-fill': canonical('#111214'),
       '--dsw-alias-button-info-hover': canonical('#292b2f'),
+      '--dsw-alias-button-primary-fill': canonical('#111214'),
       '--dsw-alias-button-primary-dimmed': canonical('#e5e6e2'),
       '--dsw-alias-button-primary-hover': canonical('#34373b'),
       '--dsw-alias-interactive-bg-active': canonical('rgba(17,18,20,.095)'),
@@ -396,6 +397,8 @@ window.__ModuleLoader__.load({
       '--dsw-alias-label-secondary': canonical('#505747'),
       '--dsw-alias-label-tertiary': canonical('#69705e'),
       '--dsw-alias-label-caption': canonical('#717664'),
+      '--dsw-alias-button-primary-fill': canonical('#59634b'),
+      '--dsw-alias-button-primary-hover': canonical('#454e39'),
       '--dsw-alias-button-info-fill': canonical('#59634b'),
       '--dsw-alias-button-info-hover': canonical('#454e39'),
       '--dsw-alias-button-elevated-fill': canonical('#f3f0e8'),
@@ -822,13 +825,18 @@ window.__ModuleLoader__.load({
           const composerCard = conversation.querySelector('[data-composer-card]')
           const composerSeatRect = composerSeat?.getBoundingClientRect?.()
           const composerRect = composerCard?.getBoundingClientRect?.()
-          if (composerRect?.width > 0) {
+          if (conversation.dataset.phase === 'hero' && composerRect?.width > 0) {
             const currentShift = Number.parseFloat(conversation.style.getPropertyValue('--prts-agent-composer-shift')) || 0
             const actualCenter = composerRect.left + composerRect.width / 2
             const nextShift = currentShift + contentCenter - actualCenter
             if (Math.abs(nextShift - currentShift) > .5) {
               conversation.style.setProperty('--prts-agent-composer-shift', `${nextShift}px`)
             }
+          } else if (conversation.dataset.phase !== 'hero') {
+            // Only Hero applies the translation. Accumulating a correction while
+            // docked keeps triggering our style observer and shifts the next Hero.
+            conversation.style.removeProperty('--prts-agent-composer-shift')
+            conversation.style.removeProperty('--prts-agent-composer-y')
           }
 
           // 原版 CPU 在 fixed system-map，字标在其下方的 hero 流中。
@@ -2431,7 +2439,7 @@ window.__ModuleLoader__.load({
         // 避免隐藏窗口仍持续渲染并让 renderer/GPU working set 不断增长。
         const pageIsActive = () => document.visibilityState !== 'hidden'
           && globalThis.__PRTS_SHELL_BACKGROUND__ !== true
-          && !document.querySelector('[aria-modal="true"][role="dialog"]')
+          && !document.querySelector('[aria-modal="true"][role="dialog"], [data-plugin-panel]')
         const syncMapActivity = () => {
           const map = mapRef.current
           if (!map) return
@@ -2647,8 +2655,11 @@ window.__ModuleLoader__.load({
       }, [historyOpen])
       const newSession = () => {
         const options = currentSummary?.cwd ? { cwd: currentSummary.cwd } : {}
-        void clientContext?.sessions?.create(options)
-          .then((sessionId) => { clientContext?.sessions?.open(sessionId) })
+        const ctx = clientContext
+        const navigation = optionalHostService(ctx, 'uiWorkspace')
+        if (typeof navigation?.startSession === 'function') { navigation.startSession(); return }
+        void ctx?.sessions?.create(options)
+          .then((sessionId) => { if (clientContext === ctx) openHostSession(ctx, sessionId) })
           .catch((error) => console.error('[prts-terrarchive] failed to create session', error))
       }
       const openSettings = () => { openHostSettings() }
@@ -2735,7 +2746,7 @@ window.__ModuleLoader__.load({
             ? sessionRows.map((session) => h('button', { type: 'button', key: session.id,
               className: `aic-session${session.id === current ? ' active' : ''}`,
               'aria-current': session.id === current ? 'page' : undefined,
-              onClick: () => { clientContext?.sessions?.open(session.id); setHistoryOpen(false) } },
+              onClick: () => { openHostSession(clientContext, session.id); setHistoryOpen(false) } },
             h('b', null, session.title || (session.blank ? '新会话' : `会话_${String(session.id).slice(0, 6)}`)),
             h('small', null, `${session.blank ? 'STANDBY' : 'ARCHIVED'} // ${new Date(session.updatedAt).toLocaleString('zh-CN')}`)))
             : h('div', { className: 'aic-empty' }, 'NO SESSION RECORDS'))))
@@ -2792,7 +2803,7 @@ window.__ModuleLoader__.load({
         const identity = version && (item.documentId || item.documentUid)
           ? `${version}:${item.documentId || item.documentUid}` : item.id
         if (typeof identity !== 'string' || !identity) continue
-        const incoming = { ...item, title: item.title.slice(0, 512),
+        const incoming = { ...item, agentReceived: true, title: item.title.slice(0, 512),
           id: version && item.documentUid ? `document:${version}:${item.documentUid}` : item.id || identity,
           origin: ['cloud', 'web'].includes(item.origin) ? item.origin : 'local',
           state: Object.hasOwn(rank, item.state) ? item.state : 'found',
@@ -3015,6 +3026,8 @@ window.__ModuleLoader__.load({
       const operations = []
       const toolCalls = []
       const operationSources = new Map()
+      let lastRead
+      let lastReadSources = []
       const entries = cache?.entries || rhineSnapshotEntries(order, nodes)
       const userEntries = entries.filter(([, node]) => node?.kind === 'user' || node?.kind === 'steering')
       const lastInput = userEntries.at(-1)
@@ -3189,8 +3202,17 @@ window.__ModuleLoader__.load({
             wikiCitations.get(id).add(field)
           }
         }
+        const delivered = sources.slice(sourceStart)
+        if (isRhineReadTool(call.name)) {
+          const readSources = delivered.filter(source => source.agentRead === true || source.state === 'read' || source.readRanges?.length > 0)
+          if (readSources.length) {
+            lastReadSources = readSources
+            lastRead = { id: String(key), tool: call.name, kind: 'read', state: 'complete', sourceIds: [],
+              ...(Number.isFinite(root.callTime) ? { startedAt: root.callTime } : {}),
+              ...(Number.isFinite(root.time) ? { completedAt: root.time } : {}) }
+          }
+        }
         if (current) {
-          const delivered = sources.slice(sourceStart)
           operationSources.set(String(key), delivered)
           if (currentTurn) turnSources.push(...delivered)
         }
@@ -3260,6 +3282,7 @@ window.__ModuleLoader__.load({
           || source.agentRead === true || source.state === 'read' || source.readRanges?.length > 0)
         operation.sourceIds = [...new Set(delivered.flatMap(deliveredMaterialId))]
       }
+      if (lastRead) lastRead.sourceIds = [...new Set(lastReadSources.flatMap(deliveredMaterialId))]
       // Report citations are recomputed from this answer only. Historical
       // citations still mark the cumulative rack, but never enter a new report.
       const reportIds = citations('report', materials, answer)
@@ -3287,6 +3310,7 @@ window.__ModuleLoader__.load({
       }
       const snapshot = { sessionId, running: !endKind && !interrupted && !terminalError && Boolean(sessionRunning || searching || assistantRunning || toolCalls.some(call => call.state === 'active')), searching, question, query, tool,
         investigationId, outcome, turnSources: currentSources, reportSources,
+        ...(lastRead?.sourceIds.length ? { lastRead } : {}),
         ...(outcome === 'completed' && Number.isFinite(end?.time) ? { completedAt: end.time } : {}),
         sources: materials, answer, records, operations, toolCalls, ...(error ? { error } : {}),
         ...(searching && activeDocumentId ? { activeDocumentId } : {}),
@@ -3427,13 +3451,26 @@ window.__ModuleLoader__.load({
     }
     // The workbench uses the same public session and model services as DSH's
     // sidebar/composer. Each controller is owned by one open archive session.
-    function createRhineHostControls(ctx, sessionId) {
+    // DSH Cordis has no optional inject group. Resolve optional capabilities at
+    // action time through get(), which also avoids retaining an unloaded service.
+    function optionalHostService(ctx, name) {
+      return typeof ctx?.get === 'function' ? ctx.get(name) : ctx?.[name]
+    }
+    function openHostSession(ctx, sessionId) {
+      const navigation = optionalHostService(ctx, 'uiWorkspace')
+      if (typeof navigation?.openSession === 'function') navigation.openSession(sessionId)
+      else if (typeof ctx?.sessions?.open === 'function') ctx.sessions.open(sessionId)
+      else throw new Error('当前宿主未提供会话导航，请更新 DSH')
+    }
+    function createRhineHostControls(ctx, sessionId, isCurrent = () => true) {
       const sessions = ctx.sessions
       const session = sessions.binding(sessionId)?.session
       const directory = ctx.modelDirectories?.directoryFor(sessionId)
       const listeners = new Set()
       let disposed = false
       let busy = false
+      let cancelling = false
+      const lifetime = new AbortController()
       let loading = false
       let error = ''
       let modes = []
@@ -3479,7 +3516,7 @@ window.__ModuleLoader__.load({
           workspace: workspace?.title || workspace?.path || current?.cwd || '',
           blank: Boolean(lifecycle?.blank ?? current?.blank),
           running: Boolean(lifecycle?.running ?? current?.running),
-          busy: busy || modelState?.status === 'selecting', loading,
+          busy: busy || modelState?.status === 'selecting', loading, cancelling,
           canSubmit: modelState?.routable !== false && !lifecycle?.removed,
           error: error || (modelState?.routable === false ? '当前模型没有可用连接，请选择其他模型。' : modelState?.error || ''),
           mode: typeof current?.projectionValues?.agentPreset === 'string' ? current.projectionValues.agentPreset : '',
@@ -3526,7 +3563,12 @@ window.__ModuleLoader__.load({
         timer = setTimeout(emit, frame === null ? 16 : 100)
       }
       const assertActive = () => {
-        if (disposed || clientContext !== ctx || sessions.list.getSnapshot().current !== sessionId) {
+        const list = sessions.list.getSnapshot()
+        // New DSH owns selection in UI Workspace. The mounting conversation
+        // supplies its identity; legacy hosts still expose list.current.
+        if (disposed || clientContext !== ctx || !isCurrent()
+          || Object.hasOwn(list, 'current') && list.current !== sessionId
+          || session?.getSnapshot?.().removed) {
           throw makeAbortError('会话已切换，请在当前会话重试')
         }
       }
@@ -3534,6 +3576,11 @@ window.__ModuleLoader__.load({
         if (!result?.ok) throw new Error(result?.error?.message || `${label}失败`)
         return result.value
       }
+      const selectHostModel = async (directory, selection) => {
+        const result = await directory.select(selection)
+        // Older DSH throws on failure and resolves void; 0.1.7 returns RemoteResult.
+        if (result !== undefined) unwrap(result, '切换模型')
+      }
       const run = async (action) => {
         assertActive()
         if (busy || directory?.store.getSnapshot().status === 'selecting') throw new Error('上一项设置正在保存，请稍候')
@@ -3573,6 +3620,8 @@ window.__ModuleLoader__.load({
         if (!id || !modes.some(mode => mode.id === id)) throw new Error('该模式暂不可用，请刷新模式列表')
       }
       const createSession = (requestedMode) => run(async () => {
+        const navigation = optionalHostService(ctx, 'layout')?.beginNavigation?.()
+        const assertNavigation = () => { assertActive(); navigation?.throwIfAborted() }
         const original = summaryOf()
         const mode = requestedMode || original?.projectionValues?.agentPreset
         if (requestedMode) requireMode(requestedMode)
@@ -3603,20 +3652,24 @@ window.__ModuleLoader__.load({
         }
         const pending = pendingCreated
         const id = pending.id
+        let reference
         try {
-          assertActive()
+          assertNavigation()
+          reference = sessions.retain?.(id, { source: 'controllerOperation', signal: lifetime.signal })
+          if (reference) await waitWithDeadline(reference.ready, { timeout: 12000, label: '新对话' })
+          assertNavigation()
           if (pending.mode) unwrap(await ctx.remote.agentPresets.select(id, pending.mode), '设置新对话模式')
-          assertActive()
-          if (pending.model) await ctx.modelDirectories.directoryFor(id).select({ ...pending.model })
-          assertActive()
-          sessions.open(id)
+          assertNavigation()
+          if (pending.model) await selectHostModel(ctx.modelDirectories.directoryFor(id), { ...pending.model })
+          assertNavigation()
+          openHostSession(ctx, id)
           if (pendingCreated === pending) pendingCreated = null
         } catch (caught) {
           // Keep the old conversation selected until the new one is fully
           // configured. Retrying the same selection reuses this blank entry.
           if (caught?.name !== 'AbortError') throw new Error(`新对话已创建，但尚未打开：${caught?.message || '配置失败'}。再次执行相同操作将重试此对话。`)
           throw caught
-        }
+        } finally { reference?.release() }
       })
       for (const [source, store] of [['sessions', sessions.list], ['workspaces', ctx.workspaces?.list], ['session', session], ['models', directory?.store]]) {
         if (store?.subscribe) cleanups.push(store.subscribe(() => requestEmit(source)))
@@ -3628,7 +3681,7 @@ window.__ModuleLoader__.load({
         subscribe(listener) { listeners.add(listener); return () => listeners.delete(listener) },
         openSession: (id) => run(async () => {
           if (!getState().sessions.some(item => item.id === id)) throw new Error('该对话已不可用，请刷新会话列表')
-          sessions.open(id)
+          openHostSession(ctx, id)
         }),
         selectMode: (id) => run(async () => {
           requireMode(id)
@@ -3645,14 +3698,19 @@ window.__ModuleLoader__.load({
           const current = directory.store.getSnapshot().current
           const effort = current?.reasoningEffort
           const reasoningEffort = choice.reasoning?.efforts?.some(item => item.id === effort) ? effort : choice.reasoning?.defaultEffort
-          await directory.select({ provider: choice.provider, model: choice.model,
+          await selectHostModel(directory, { provider: choice.provider, model: choice.model,
             ...(reasoningEffort ? { reasoningEffort } : {}) })
         }),
-        cancel: () => run(async () => {
+        async cancel() {
+          assertActive()
+          if (cancelling) return
           if (!session?.cancel) throw new Error('当前会话尚未连接')
-          unwrap(await session.cancel(), '停止当前任务')
-        }),
-        dispose() { disposed = true; cancelPending(); monitor = undefined; pendingCreated = null; for (const cleanup of cleanups) cleanup(); listeners.clear() },
+          cancelling = true; error = ''; emit()
+          try { unwrap(await session.cancel(), '停止当前任务') }
+          catch (caught) { if (!disposed && caught?.name !== 'AbortError') error = caught?.message || '停止失败'; throw caught }
+          finally { cancelling = false; emit() }
+        },
+        dispose() { disposed = true; lifetime.abort(); cancelPending(); monitor = undefined; pendingCreated = null; for (const cleanup of cleanups) cleanup(); listeners.clear() },
       }
       return controls
     }
@@ -3699,6 +3757,9 @@ window.__ModuleLoader__.load({
           setOpen(value === 'rhine-lab')
         }
         rhineSkinListeners.add(listener)
+        // Skin loading can finish between this component's initial render and
+        // effect subscription. Reconcile the live value for existing sessions.
+        listener(activeSkin)
         return () => rhineSkinListeners.delete(listener)
       }, [])
       useEffect(() => { workbench.current?.update(snapshot) }, [snapshot])
@@ -3746,7 +3807,7 @@ window.__ModuleLoader__.load({
         void loadRhineBundle().then((runtime) => {
           if (disposed || clientContext !== ctx || signal?.aborted) return
           status.remove()
-          hostControls = ctx.sessions?.list?.getSnapshot ? createRhineHostControls(ctx, sessionId) : null
+          hostControls = ctx.sessions?.list?.getSnapshot ? createRhineHostControls(ctx, sessionId, () => latestSnapshot.current.sessionId === sessionId) : null
           instance = runtime.mountRhineWorkbench(overlay, {
             assetBase: RHINE_BASE, snapshot: latestSnapshot.current, snapshotDiagnostics,
             ...(hostControls ? { host: hostControls } : {}),