dsh-vscode-mode 0.11.0 → 0.13.0

package/src/client/panelCommands.ts

@@ -0,0 +1,101 @@
+import type { SessionScope } from './sessionScope.js'
+
+export type PanelAction = 'quickOpen' | 'searchInFiles'
+export interface PanelRoute {
+  readScope(): SessionScope
+  canOpen(): boolean
+  open(): boolean
+}
+interface PendingPanel extends SessionScope { action: PanelAction; expires: number }
+interface PanelHost { action: PanelAction; scope: SessionScope; run(): void }
+let route: PanelRoute | null = null
+const hosts = new Set<PanelHost>()
+const storage = globalThis as typeof globalThis & { __edrvPanelCommand__?: PendingPanel }
+
+/**
+ * Compare the command's session and workspace identity.
+ * @author ddj 2026年09月28号
+ * @param left Requested scope.
+ * @param right Mounted scope.
+ * @returns Whether both refer to the same session and known workspace.
+ */
+function sameScope(left: SessionScope, right: SessionScope): boolean {
+  return Boolean(left.sessionId && left.sessionId === right.sessionId
+    && (!left.cwd || !right.cwd || left.cwd === right.cwd))
+}
+
+/**
+ * Find the most recently mounted matching command receiver.
+ * @author ddj 2026年09月28号
+ * @param action Panel action.
+ * @param scope Active session scope.
+ * @returns Receiver if mounted.
+ */
+function panelHost(action: PanelAction, scope: SessionScope): PanelHost | undefined {
+  return [...hosts].reverse().find((host) => host.action === action && sameScope(scope, host.scope))
+}
+
+/**
+ * Install the existing sidebar route and current-session reader.
+ * @author ddj 2026年09月28号
+ * @param next Route capabilities; no side effects during availability checks.
+ * @returns Identity-safe disposal; pending intent survives plugin reload.
+ */
+export function setPanelRoute(next: PanelRoute): () => void {
+  route = next
+  return () => { if (route === next) route = null }
+}
+
+/**
+ * Check that a command has a mounted receiver or a usable editor route.
+ * @author ddj 2026年09月28号
+ * @param action Panel action.
+ * @returns False when genuinely unavailable, allowing official key dispatch to pass.
+ */
+export function panelAvailable(action: PanelAction): boolean {
+  const scope = route?.readScope()
+  if (!scope?.sessionId) return false
+  return Boolean(panelHost(action, scope) || route?.canOpen())
+}
+
+/**
+ * Deliver now or preserve an intent until the editor mounts.
+ * @author ddj 2026年09月28号
+ * @param action Panel action.
+ * @returns Whether the mounted host or sidebar accepted the request.
+ */
+export function runPanelCommand(action: PanelAction): boolean {
+  const scope = route?.readScope()
+  if (!scope?.sessionId) return false
+  const host = panelHost(action, scope)
+  if (host) { host.run(); return true }
+  if (!route?.canOpen()) return false
+  const pending = { ...scope, action, expires: Date.now() + 30_000 }
+  storage.__edrvPanelCommand__ = pending
+  try {
+    if (route.open()) return true
+  } catch { /* A disappearing sidebar leaves the command unhandled. */ }
+  if (storage.__edrvPanelCommand__ === pending) delete storage.__edrvPanelCommand__
+  return false
+}
+
+/**
+ * Attach one scoped receiver and consume a still-current pending intent once.
+ * @author ddj 2026年09月28号
+ * @param action Panel action.
+ * @param scope Mounted session/workspace.
+ * @param run Action using the mounted component's state.
+ * @returns Receiver disposal.
+ */
+export function bindPanelCommand(action: PanelAction, scope: SessionScope, run: () => void): () => void {
+  const host = { action, scope, run }
+  hosts.add(host)
+  const pending = storage.__edrvPanelCommand__
+  if (pending && (pending.expires < Date.now() || !sameScope(pending, route?.readScope() ?? {}))) {
+    delete storage.__edrvPanelCommand__
+  } else if (pending?.action === action && sameScope(pending, scope)) {
+    delete storage.__edrvPanelCommand__
+    run()
+  }
+  return () => { hosts.delete(host) }
+}

package/src/client/pdf/pdfLoader.ts

@@ -7,8 +7,10 @@
  * 作者 ddj 2026-09-22
  */
 
-/** vendor 根（routes.ts /edrv/vendor 前缀路由分发 assets/vendor/*）。 */
-export const PDFJS_BASE = '/edrv/vendor/pdfjs'
+import { appUrl } from '../../shared/appUrl.js'
+
+/** vendor 根，保留官方桌面协议及反向代理前缀。 */
+export const PDFJS_BASE = appUrl('/edrv/vendor/pdfjs')
 /** pdf.js Worker 地址（GlobalWorkerOptions.workerSrc）。 */
 export const PDFJS_WORKER_SRC = PDFJS_BASE + '/build/pdf.worker.mjs'
 /** CJK 字符映射目录（中文 PDF 渲染必需，尾斜杠固定）。 */

package/src/client/receiptState.ts

@@ -0,0 +1,120 @@
+import { absoluteOf } from './tabActions.js'
+import type { EditorRequest } from './openReceipt.js'
+
+/** Identity of one load, committed together with its text or preview state. */
+export interface ReceiptLoad {
+  sessionId: string
+  cwd: string | null
+  path: string
+  sequence: number
+  status: 'loading' | 'ready' | 'error'
+  error?: string
+}
+
+/** Current rendered facts; generic save/SVN errors intentionally have no receipt field. */
+export interface ReceiptView {
+  sessionId: string
+  cwd?: string | null
+  active: string | null
+  sequence: number
+  load: ReceiptLoad | null
+  mounted: boolean
+  blocked: boolean
+  kind: 'text' | 'image' | 'pdf' | 'markdown'
+  contentPath: string | null
+  contentReady: boolean
+  modelMatches: boolean
+  positionMatches: boolean
+  imageLoaded: boolean
+  pdfLoaded: boolean
+  engineError?: string | null
+}
+
+/**
+ * Normalize identity using the workspace's path syntax, never the browser OS.
+ * @public @author ddj 2026年09月28号
+ * @param path File path.
+ * @param cwd Workspace root, including remote POSIX roots on Windows clients.
+ * @returns Absolute normalized identity, case folded only for Windows paths.
+ */
+export function receiptPath(path: string, cwd?: string | null): string {
+  const value = absoluteOf(path, cwd)
+  return /^(?:[a-z]:\/|\/\/)/i.test(value) ? value.toLowerCase() : value
+}
+
+/**
+ * Preserve POSIX case when converting an external path into a tab path.
+ * @public @author ddj 2026年09月28号
+ * @param path External file path.
+ * @param cwd Workspace root.
+ * @returns Relative path only when it is inside the same correctly cased root.
+ */
+export function receiptTabPath(path: string, cwd?: string | null): string {
+  const value = path.replace(/\\/g, '/')
+  const base = (cwd ?? '').replace(/\\/g, '/').replace(/\/+$/, '')
+  if (base && receiptPath(value).startsWith(receiptPath(base) + '/')) return value.slice(base.length + 1)
+  return value
+}
+
+/**
+ * Match a load to the current request, rendered path, and live load sequence.
+ * @private @author ddj 2026年09月28号
+ * @param request Claimed request.
+ * @param view Current render and load metadata.
+ * @returns Whether load facts belong to this exact target and generation.
+ */
+function ownsLoad(request: EditorRequest, view: ReceiptView): boolean {
+  const load = view.load
+  if (!request.path || !view.active || !load) return false
+  const wanted = receiptPath(request.path, view.cwd)
+  return request.sessionId === view.sessionId && load.sessionId === view.sessionId
+    && load.sequence === view.sequence && receiptPath(load.path, load.cwd) === wanted
+    && receiptPath(view.active, view.cwd) === wanted
+}
+
+/**
+ * Confirm actual content/preview/navigation readiness for a correlated generation.
+ * @public @author ddj 2026年09月28号
+ * @param request Claimed external open.
+ * @param view Rendered state, including model identity and DOM readiness.
+ * @returns True only when the requested target is genuinely presented.
+ */
+export function receiptReadyFor(request: EditorRequest, view: ReceiptView): boolean {
+  if (request.sessionId !== view.sessionId) return false
+  if (!request.path) return view.mounted
+  if (!ownsLoad(request, view) || view.load?.status !== 'ready' || view.blocked || view.engineError) return false
+  if (view.kind === 'image') return view.imageLoaded
+  if (view.kind === 'pdf') return view.pdfLoaded
+  if (!view.contentReady || !view.contentPath || receiptPath(view.contentPath, view.cwd) !== receiptPath(request.path, view.cwd)) return false
+  const positioned = request.line != null || request.column != null
+  if (view.kind === 'markdown') return !positioned
+  return view.modelMatches && (!positioned || view.positionMatches)
+}
+
+/**
+ * Return only errors from this target's current load/render generation.
+ * @public @author ddj 2026年09月28号
+ * @param request Claimed request.
+ * @param view Rendered metadata and editor-engine startup failure.
+ * @returns Correlated error, otherwise null; prior files and save errors are ignored.
+ */
+export function receiptErrorFor(request: EditorRequest, view: ReceiptView): string | null {
+  if (!ownsLoad(request, view)) return null
+  if (view.engineError) return view.engineError
+  return view.load?.status === 'error' ? view.load.error ?? '文件加载失败' : null
+}
+
+/**
+ * Guard delayed load/render callbacks against a replacement generation.
+ * @public @author ddj 2026年09月28号
+ * @param load Current committed metadata.
+ * @param sessionId Callback owner.
+ * @param path Callback target, already normalized as a tab path.
+ * @param sequence Callback load sequence.
+ * @param currentSequence Live loader sequence.
+ * @returns Whether this callback may update the receipt status.
+ */
+export function acceptsLoad(load: ReceiptLoad | null, sessionId: string, path: string, sequence: number, currentSequence: number): boolean {
+  return Boolean(load && load.sessionId === sessionId && load.path === path
+    && load.sequence === sequence && sequence === currentSequence)
+}

package/src/client/rpc.ts

@@ -4,6 +4,7 @@
  * 诊断开关运行时化：内存缓存 + localStorage 持久（日志弹窗开关即改即生效，免刷新）。
  * 作者 ddj 2026-08-20 / 2026-09-17
  */
+import { appUrl } from '../shared/appUrl.js'
 import { RPC_PATH } from '../shared/rpc.js'
 import type { RpcMethod, RpcRequestMap, RpcResult } from '../shared/rpc.js'
 import type { LoggerLevel } from '../shared/logger.js'
@@ -35,13 +36,38 @@ export function setDebugEnabled(on: boolean): void {
   } catch (e) { /* 无 localStorage 环境：仅内存生效 */ }
 }
 
-/** 同源 RPC 调用（host /edrv/rpc 精确路由）。 */
-export function rpc<M extends RpcMethod>(method: M, args: RpcRequestMap[M]): Promise<RpcResult<M>> {
-  return fetch(RPC_PATH, {
+/**
+ * Call the authenticated RPC route using the current application base.
+ * @author ddj 2026年09月28号
+ * @param method Typed business method.
+ * @param args Business arguments.
+ * @param signal Optional cancellation signal.
+ * @returns A validated business result; transport failures reject with a readable error.
+ */
+export async function rpc<M extends RpcMethod>(method: M, args: RpcRequestMap[M], signal?: AbortSignal): Promise<RpcResult<M>> {
+  const res = await fetch(appUrl(RPC_PATH), {
     method: 'POST',
+    credentials: 'same-origin',
     headers: { 'content-type': 'application/json' },
     body: JSON.stringify({ method, args }),
-  }).then((res) => res.json()) as Promise<RpcResult<M>>
+    signal,
+  })
+  if (!res.ok) {
+    const message = res.status === 401 ? 'DSH 登录已失效，请重新打开已登录的应用页面'
+      : res.status === 403 ? 'DSH 拒绝了当前页面的访问'
+      : res.status === 413 ? '请求超过支持的文件大小'
+      : res.status === 503 ? 'DSH 认证服务尚未就绪'
+      : 'DSH 请求失败（HTTP ' + res.status + '）'
+    throw new Error(message)
+  }
+  if (!/^application\/json(?:\s*;|\s*$)/i.test(res.headers.get('content-type') ?? '')) {
+    throw new Error('DSH 返回了非 JSON 响应，请检查应用地址和代理配置')
+  }
+  const value: unknown = await res.json()
+  if (!value || typeof value !== 'object' || typeof (value as { ok?: unknown }).ok !== 'boolean') {
+    throw new Error('DSH RPC 响应格式不正确')
+  }
+  return value as RpcResult<M>
 }
 
 /**

package/src/client/shortcutRecorder.ts

@@ -0,0 +1,161 @@
+import type { OfficialBinding, OfficialModifier } from '../shared/keybindings.js'
+import type { ShortcutsServiceLike } from './shortcutsOfficial.js'
+
+export interface RecordHooks {
+  ready(): void
+  save(binding: OfficialBinding | null): void
+  cancel(): void
+  error(error: unknown): void
+}
+const recorderHost = globalThis as typeof globalThis & { __edrvRecording__?: WeakMap<ShortcutsServiceLike, Promise<void>> }
+const leases = recorderHost.__edrvRecording__ ??= new WeakMap<ShortcutsServiceLike, Promise<void>>()
+
+/**
+ * Serialize native recorder state, including cleanup after a late ready response.
+ * @author ddj 2026年09月28号
+ * @param service Native/Web shortcut service.
+ * @param active Desired native interception state.
+ * @returns Completion of the state change; errors remain visible to the caller.
+ */
+function recordState(service: ShortcutsServiceLike, active: boolean): Promise<void> {
+  const prior = leases.get(service) ?? Promise.resolve()
+  const next = prior.catch(() => {}).then(() => service.recording(active))
+  leases.set(service, next)
+  return next
+}
+
+/**
+ * Read physical modifiers without converting Control or Meta into logical primary.
+ * @author ddj 2026年09月28号
+ * @param event Keyboard event.
+ * @returns Modifiers in official canonical order.
+ */
+export function eventModifiers(event: KeyboardEvent): OfficialModifier[] {
+  const states = { control: event.ctrlKey, alt: event.altKey, shift: event.shiftKey, meta: event.metaKey }
+  return (Object.keys(states) as Array<keyof typeof states>).filter((key) => states[key])
+}
+
+/** Physical key collection; native readiness and listeners are owned by startRecording. */
+export class KeyCapture {
+  private held = new Set<string>()
+  private pending: OfficialBinding | null = null
+  private blocked = false
+  private dead = false
+  private composing = false
+
+  /**
+   * Create a physical collector with official platform capabilities.
+   * @author ddj 2026年09月28号
+   * @param service Official binding validator and profile.
+   * @param hooks Completion/error handlers.
+   */
+  constructor(private service: ShortcutsServiceLike, private hooks: RecordHooks) {}
+
+  /**
+   * Reset a gesture on blur or composition transitions.
+   * @author ddj 2026年09月28号
+   * @param composing Whether IME composition is currently active.
+   */
+  reset(composing = false): void {
+    this.held.clear(); this.pending = null; this.blocked = false; this.dead = false
+    this.composing = composing
+  }
+
+  /**
+   * Collect one physical press; commit only when a constituent key is released.
+   * @author ddj 2026年09月28号
+   * @param event Keyboard press; guarded IME/AltGraph input is left untouched.
+   */
+  down(event: KeyboardEvent): void {
+    if (this.composing || event.isComposing || event.keyCode === 229 || event.getModifierState?.('AltGraph')) {
+      this.pending = null; this.held.clear(); return
+    }
+    const commandDead = this.service.runtime === 'web' && this.service.platform === 'macos'
+      && event.code === 'KeyN' && event.metaKey && event.altKey && !event.ctrlKey && !event.shiftKey
+    if (event.key === 'Dead' && !commandDead) { this.reset(); this.dead = true; return }
+    if (this.dead) { this.dead = false; return }
+    event.preventDefault(); event.stopPropagation()
+    if (event.repeat) return
+    const modifiers = eventModifiers(event)
+    if (!modifiers.length && event.key === 'Escape') { this.hooks.cancel(); return }
+    if (!modifiers.length && (event.key === 'Backspace' || event.key === 'Delete')) { this.hooks.save(null); return }
+    if (/^(Control|Alt|Shift|Meta|AltGraph)(Left|Right)?$/u.test(event.code || event.key)) {
+      if (this.pending) this.reset()
+      return
+    }
+    const chords = this.service.runtime === 'desktop' && ['macos', 'windows'].includes(this.service.platform)
+    if (chords) this.held.add(event.code)
+    if (this.blocked) return
+    if (this.held.size > 2) {
+      this.pending = null; this.blocked = true; this.hooks.error('最多同时录制两个主键'); return
+    }
+    const codes = chords ? [...this.held] : [event.code]
+    try {
+      const probe = this.service.describeBinding({ code: codes[0], modifiers, ...(codes[1] ? { secondCode: codes[1] } : {}) })
+      if (!probe.binding || probe.issue) throw new Error(probe.issue ?? 'unsupported-key')
+      this.pending = probe.binding
+    } catch (error) { this.pending = null; this.hooks.error(error) }
+  }
+
+  /**
+   * Commit an accepted physical gesture once at release.
+   * @author ddj 2026年09月28号
+   * @param event Released key or modifier.
+   */
+  up(event: KeyboardEvent): void {
+    this.held.delete(event.code)
+    const binding = this.pending
+    const modifier = event.code.replace(/(Left|Right)$/u, '').toLowerCase() as OfficialModifier
+    if (!binding || !(binding.code === event.code || binding.secondCode === event.code || binding.modifiers.includes(modifier))) return
+    this.pending = null
+    event.preventDefault(); event.stopPropagation()
+    this.hooks.save(binding)
+  }
+}
+
+/**
+ * Protect recording before listening, and restore interception on every exit path.
+ * @author ddj 2026年09月28号
+ * @param service Official service whose asynchronous native bridge must be ready.
+ * @param target Owning window, injectable for lifecycle tests.
+ * @param hooks Ready, save, cancel and failure callbacks.
+ * @returns Idempotent disposal, safe before readiness and after failure.
+ */
+export function startRecording(service: ShortcutsServiceLike, target: EventTarget, hooks: RecordHooks): () => void {
+  let disposed = false
+  let ready = false
+  /** @author ddj 2026年09月28号 @param binding Accepted binding; release interception before saving. */
+  const save = (binding: OfficialBinding | null): void => { dispose(); hooks.save(binding) }
+  /** @author ddj 2026年09月28号 Cancel capture and restore native interception. */
+  const cancel = (): void => { dispose(); hooks.cancel() }
+  const capture = new KeyCapture(service, { ...hooks, save, cancel })
+  /** @author ddj 2026年09月28号 @param event Physical key press. */
+  const down = (event: Event): void => { if (ready) capture.down(event as KeyboardEvent) }
+  /** @author ddj 2026年09月28号 @param event Physical key release. */
+  const up = (event: Event): void => { if (ready) capture.up(event as KeyboardEvent) }
+  /** @author ddj 2026年09月28号 Reset incomplete gesture on focus loss. */
+  const blur = (): void => capture.reset()
+  /** @author ddj 2026年09月28号 Guard the complete IME composition lifecycle. */
+  const compose = (): void => capture.reset(true)
+  const listeners: Array<[string, EventListener]> = [
+    ['keydown', down], ['keyup', up], ['blur', blur], ['compositionstart', compose], ['compositionend', blur],
+  ]
+  /** @author ddj 2026年09月28号 Release DOM listeners and serialize native restoration. */
+  const dispose = (): void => {
+    if (disposed) return
+    disposed = true; ready = false
+    for (const [name, handler] of listeners) target.removeEventListener(name, handler, { capture: true })
+    void recordState(service, false).catch(hooks.error)
+  }
+  /** @author ddj 2026年09月28号 Activate capture only after native acknowledgment. */
+  const activate = (): void => {
+    if (disposed) return
+    ready = true
+    for (const [name, handler] of listeners) target.addEventListener(name, handler, { capture: true })
+    hooks.ready()
+  }
+  /** @author ddj 2026年09月28号 @param error Native activation failure. */
+  const fail = (error: unknown): void => { if (!disposed) { dispose(); hooks.error(error) } }
+  void recordState(service, true).then(activate, fail)
+  return dispose
+}