dsh-notch 0.3.1 → 0.3.6

package/src/client/index.ts

@@ -0,0 +1,104 @@
+import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client'
+import type {} from '@deepseek-ai/dsh-client-ui-session/client'
+import type {} from '@deepseek-ai/dsh-client-ui-workspace/client'
+import type { SessionId } from '@deepseek-ai/dsh-session/types'
+/**
+ * Headless follower: polls the Host for notch focus wishes and selects the
+ * session in every open DSH page (app webview or browser tab).
+ *
+ * First poll only arms (ignores a wish already sitting there) so a reload
+ * does not yank the current session. A later click bumps `at` and opens.
+ */
+import type { Context as ClientContext } from '@deepseek-ai/cordis'
+
+export const name = 'dsh-notch-client'
+export const inject = ['sessions', 'uiWorkspace', 'uiSession']
+
+interface PendingFocusWire {
+  ok?: boolean
+  focus?: { sessionId?: string; at?: number } | null
+}
+
+const POLL_MS = 400
+
+export function apply(ctx: ClientContext): void {
+  const sessions = ctx.get('sessions') as unknown as ISessions
+  const clientId = crypto.randomUUID()
+  let lastAt = 0
+  let armed = false
+  let stopped = false
+  const controller = new AbortController()
+
+  const open = async (sessionId: string): Promise<void> => {
+    try {
+      ctx.uiWorkspace.openSession(sessionId as SessionId)
+      return
+    } catch {
+      /* list may be stale; refresh once and retry */
+    }
+    try {
+      await sessions.refresh()
+      if (stopped) return
+      ctx.uiWorkspace.openSession(sessionId as SessionId)
+    } catch {
+      /* session not in this page's list */
+    }
+  }
+
+  const poll = async (): Promise<void> => {
+    try {
+      const snapshot = sessions.list.getSnapshot()
+      if (snapshot.phase === 'ready') {
+        // parentId also records independent user forks; only origin classifies
+        // a delegated child, matching the official workspace sidebar.
+        const rows = snapshot.ids.map(id => snapshot.byId[id]).filter(row => row && row.origin !== 'subagent').map(row => ({ id: row.id, title: row.displayTitle, completed: ctx.uiSession.sessionStatus.getSnapshot().get(row.id)?.completionUnread === true, running: row.running, updatedAt: row.updatedAt }))
+        const focused = document.hasFocus()
+        const current = rows.find(row => row.id === Object.values(snapshot.byId).find(item => (item.retainedBy?.mainView ?? 0) > 0)?.id)
+        // updatedAt is the user's prompt timestamp, not the completion time.
+        // Capture this observation before sending it, so a delayed request
+        // cannot acknowledge a turn that finishes after the user looked.
+        const viewed = focused && current && !current.running
+          ? { id: current.id, at: Date.now() } : undefined
+        await fetch('/dsh-notch/sidebar', { signal: controller.signal, method: 'POST', headers: { 'content-type': 'application/json', 'x-dsh-notch-client': '1' }, body: JSON.stringify({ clientId, projectionVersion: 3, focused, viewed, rows }) })
+      }
+      if (stopped) return
+      const response = await fetch('/dsh-notch/pending-focus', { cache: 'no-store', signal: controller.signal })
+      if (!response.ok) return
+      const data = (await response.json()) as PendingFocusWire
+      if (stopped) return
+      const focus = data.focus
+      if (!armed) {
+        armed = true
+        if (focus && typeof focus.at === 'number') lastAt = focus.at
+        return
+      }
+      if (!focus || typeof focus.at !== 'number' || focus.at <= lastAt) return
+      if (typeof focus.sessionId !== 'string' || focus.sessionId === '') return
+      lastAt = focus.at
+      await open(focus.sessionId)
+      try {
+        if (stopped) return
+        window.focus()
+      } catch {
+        /* native helper already fronts DSH.app */
+      }
+    } catch {
+      /* Host unreachable mid-poll; the next tick retries. */
+    }
+  }
+
+  const tick = (): void => {
+    if (stopped) return
+    void poll().finally(() => {
+      if (!stopped) timer = window.setTimeout(tick, POLL_MS)
+    })
+  }
+  let timer: ReturnType<typeof window.setTimeout> | undefined
+  tick()
+
+  ctx.effect(() => () => {
+    stopped = true
+    if (timer !== undefined) window.clearTimeout(timer)
+    controller.abort()
+  }, 'dsh-notch: client sync')
+}

package/src/dsh-notch.ts

@@ -1,16 +1,23 @@
 import type { Context } from '@deepseek-ai/cordis'
+import Schema from '@deepseek-ai/schemastery'
+import { createWriteStream, existsSync } from 'node:fs'
+import { join } from 'node:path'
+import { superviseNotch } from '../desktop/notch-lifecycle.mjs'
 import type { ApprovalOutcome, ApprovalRequest } from '@deepseek-ai/dsh-user-approval'
 import type { AskUserQuestionAnswer, AskUserQuestionRequest } from '@deepseek-ai/dsh-user-questions'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 import type {} from '@deepseek-ai/dsh-session'
 import { Board } from './board.ts'
 import { attachHttp } from './http.ts'
-import { loadOrCreateToken, writeRuntime } from './store.ts'
+import { DIR, RUNTIME, loadOrCreateToken, writeRuntime } from './store.ts'
 
 export const name = 'dsh-notch'
 export const inject = ['sessions', 'webServer', 'approval', 'userQuestions', 'agents']
+export const Config = Schema.object({
+  helperPath: Schema.string().default('').description('Optional installed native Notch executable; managed for this Host lifetime.'),
+})
 
-export function apply(ctx: Context) {
+export function apply(ctx: Context, config: { helperPath?: string } = {}) {
   console.log('[my-plugins/dsh-notch] loaded')
   const board = new Board(ctx)
   const token = loadOrCreateToken()
@@ -21,6 +28,15 @@ export function apply(ctx: Context) {
     pid: process.pid,
     writtenAt: Date.now(),
   })
+  if (config.helperPath) {
+    if (!existsSync(config.helperPath)) throw new Error('Configured Notch helper does not exist')
+    ctx.effect(() => {
+      const log = createWriteStream(join(DIR, 'helper.log'), { flags: 'a', mode: 0o600 })
+      const helper = superviseNotch({ bin: config.helperPath, pidPath: join(DIR, 'helper.pid'), log,
+        env: { ...process.env, DSH_NOTCH_RUNTIME_FILE: RUNTIME } })
+      return () => { helper.stop(); log.end() }
+    }, 'dsh-notch: native helper')
+  }
 
   ctx.effect(() => attachHttp(ctx, board, token, origin), 'dsh-notch: http')
 
@@ -30,6 +46,7 @@ export function apply(ctx: Context) {
   ctx.effect(() => ctx.on('session/disposed', notify), 'dsh-notch: disposed')
   ctx.effect(() => ctx.on('session/event', (session, event) => {
     const type = String(event.type)
+    if (type === 'turn/end') board.noteTurnEnd(session, event.time)
     if (type === 'turn/start' || type === 'turn/end' || type === 'session/title') {
       notify()
     }

package/src/http.ts

@@ -41,6 +41,17 @@ export function browserTrusted(req: IncomingMessage): boolean {
   }
 }
 
+/** Accept same-origin Web writes and requests forwarded by the Desktop shell. */
+export function sidebarTrusted(req: IncomingMessage, origin: string): boolean {
+  if (!browserTrusted(req) || !req.headers['content-type']?.startsWith('application/json')) return false
+  if (req.headers.origin !== undefined) return true
+  // Desktop validates dsh-app://app, then removes Origin and fetch metadata.
+  // A script-only header still prevents a foreign page from submitting a form.
+  return req.headers['x-dsh-notch-client'] === '1'
+    && req.headers['sec-fetch-site'] === undefined
+    && req.headers.host === new URL(origin).host
+}
+
 function send(res: ServerResponse, status: number, body: unknown): void {
   const json = JSON.stringify(body)
   res.writeHead(status, {
@@ -100,8 +111,7 @@ export function attachHttp(ctx: Context, board: Board, token: string, origin: st
     }
 
     if (method === 'POST' && path === `${PREFIX}/sidebar`) {
-      // JSON, explicit same origin, and browser fetch metadata prevent cross-site writes.
-      if (!browserTrusted(req) || !req.headers.origin || !req.headers['content-type']?.startsWith('application/json')) {
+      if (!sidebarTrusted(req, origin)) {
         send(res, 403, { ok: false, error: 'forbidden' })
         return
       }
@@ -120,6 +130,11 @@ export function attachHttp(ctx: Context, board: Board, token: string, origin: st
       return
     }
 
+    if (method === 'GET' && path === `${PREFIX}/diagnostics`) {
+      send(res, 200, board.diagnostics())
+      return
+    }
+
     if (method === 'GET' && path === `${PREFIX}/events`) {
       const id = randomUUID()
       res.writeHead(200, {

package/src/session-state.ts

@@ -27,5 +27,19 @@ export function foldSession(session: Session): FoldedSession {
 }
 
 export function isChildSession(session: Session): boolean {
-  return session.header.parentSession !== undefined || session.header.origin === 'subagent'
+  // parentSession is also seed lineage for an independent user fork.
+  // Use the same presentation discriminator as Harness's workspace sidebar.
+  return session.header.origin === 'subagent'
+}
+
+/** Follow only delegation edges; user forks remain separate conversations. */
+export function conversationOwner(session: Session, sessions: ReadonlyMap<string, Session>): Session | undefined {
+  let current: Session | undefined = session
+  const visited = new Set<string>()
+  while (current && isChildSession(current)) {
+    if (visited.has(current.id)) return undefined
+    visited.add(current.id)
+    current = current.header.parentSession === undefined ? undefined : sessions.get(current.header.parentSession)
+  }
+  return current
 }

package/src/store.ts

@@ -1,10 +1,10 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
-import { homedir } from 'node:os'
+import { resolveDshHome } from '@deepseek-ai/dsh-home-paths'
 import { join } from 'node:path'
 import { randomBytes } from 'node:crypto'
 
-const DIR = join(homedir(), '.dsh', 'dsh-notch')
-const RUNTIME = join(DIR, 'runtime.json')
+export const DIR = join(resolveDshHome(), 'dsh-notch')
+export const RUNTIME = join(DIR, 'runtime.json')
 const SEEN = join(DIR, 'seen.json')
 
 export interface RuntimeFile {

package/src/types.ts

@@ -47,8 +47,11 @@ export interface NotchRow {
 
 export interface NotchSnapshot {
   ok: true
+  stateRevision?: number
   generatedAt: number
   sidebarSyncedAt?: number
+  /** Browser mirror generation observed in a recent heartbeat; absent for legacy clients. */
+  sidebarProjectionVersion?: number
   origin: string
   rows: NotchRow[]
 }

package/BASELINE.md

@@ -1,13 +0,0 @@
-# 2026-09-10 baseline
-
-Snapshot of the existing native Notch and Host plugin, before robot idle experiments.
-
-Verification on macOS:
-- Host tests: 8 passed (tsx 4.22.4).
-- Native motion probe: FAILURES=0.
-- Native geometry probe: FAILURES=0; compact one/two/three lamp heights 44/72/100 pt.
-- No live Host restart or model calls during this snapshot.
-
-Existing manual acceptance covered first-click response, keyboard editing, long content, retry, multi-question navigation and queued questions. Automated tests do not replace live DSH acceptance after future installation.
-
-The idle robot is a separate experiment and is not part of this baseline.

package/DESIGN.md

@@ -1,34 +0,0 @@
-# Notch 动作与状态转场
-
-本次范围：运行转为审核、成功或失败；分别覆盖只有一个任务，以及两个任务中一个改变状态。保留用户最近同步的玻璃外壳、排版和机器人资源；候选效果先在独立原生预览中验收，不安装到 DSH。
-
-## 动效规则
-
-由当前蓝色弧线出发，头部沿路径前进、尾部跟随，途中连续变色。黄色审核和绿色成功向上，红色失败向下。到达目标后沿圆周画线，再出现实心圆及符号。有其他任务运行时，线条从目标色连续回到蓝色运行弧；最后一个任务结束或等待审核时，笔画收在目标圈，源槽随之收起。不得用整圈平移或同时淡入两个圆代替笔画移动。
-
-沿用已接受的 0.95 秒笔画时间轴和 19 pt 圆直径，颜色、字形与坐标使用现有定义。自动展开审核面板等待笔画结束，主动交互不因动画被禁用；重复轮询不重播，旧回调不能覆盖新状态。减少动态效果直接显示最终状态。
-
-## 设计依据与验证
-
-| Active concept | 决策 | 实现位置 | 验证 |
-| --- | --- | --- | --- |
-| motion-language | 三种结果共用有方向的笔画语义；保留当前弧线作为起点 | StatusFlight / StatusOrbitView | 原速六场景原生预览与逐帧截图 |
-| motion-contract | 同一时间轴约束路程、颜色、填充、布局；只在有剩余工作时返回 | BoardModel / OrbitLayout / OrbitMotionFrame | OutcomeProbe、MotionProbe、取消和重复事件检查 |
-
-视觉沿用纯黑紧凑外壳、细线与圆角字形；本轮不增加装饰。主要识别特征是线条本身连续转移。原生 AppKit/SwiftUI 使用原生渲染证据，浏览器 motion validator 不适用。
-
-## 本轮验证
-
-黄色已使用 StatusFlight 的 decision 结果类别，沿红绿共享的路径、时间轴和填充顺序绘制。单任务中源数字与黑底在线条离开时淡出，避免收缩时压住结果圆。自动展开推迟到审核笔画完成，取消审核会取消待展开请求。
-
-OutcomeProbe 六场景与重复事件、快速取消、连续结果检查通过；项目原 MotionProbe（含减少动态效果静止检查）通过。原生渲染器采样六场景的逐帧图像并人工检查，证据位于 `本地 motion proof 输出目录`。六场景本地预览已展示；运行中 DSH 未安装此候选，用户对自然程度的验收仍以预览反馈为准。
-
-## 决策回复回程（本轮）
-
-覆盖完整的 `蓝 1 → 黄 → 蓝 1` 与 `蓝 2 → 蓝 1＋黄 → 蓝 2`。单灯保留已接受的清空填充、从顶部画蓝环的回程；双灯由黄圈抽出笔画，沿既有路径的返回段汇入蓝环，再把数字从 1 渐变到 2。黄灯、线条与外壳使用同一进度，源填充消失后才收起槽位。若面板正在折叠，回程从折叠完成时开始，使线条可见。回复很快时接在去程后播放；取消且没有恢复运行时不制造蓝灯；轮询不重播，旧回调不覆盖新回程。
-
-Active motion-language 绑定：回复恢复同一任务的可见因果 → DecisionReturn / StatusOrbitView → 两条往返原速预览。Active motion-contract 绑定：数字在汇入时更新、路径及旋转速度连续、折叠不吞动画 → BoardModel / DecisionReturnFrame → OutcomeProbe 和确定时间逐帧渲染。沿用当前颜色、19 pt 灯、0.95–0.98 秒时间轴、系统减少动态效果设置。
-
-## 双语录屏
-
-录屏标题使用中文在上、英文在下，只呈现同一个转换名称。六格与单景均保留固定标题区，英文不挤占动画空间。36 个场景由同一份生产源构建，录屏工具仅替换传输层并发送定向待机动作，不重写状态曲线。

package/cordis.yml

@@ -1,5 +0,0 @@
-# portable overlay: relative name only. --patch resolves against the profile
-# directory, so cold-boot through `dshx start` / `dshx verify-boot`, not raw pnpm dsh.
-- insert:
-    - id: dsh-notch
-      name: './src/dsh-notch.ts'

package/macos/Package.swift

@@ -1,17 +0,0 @@
-// swift-tools-version: 6.0
-import PackageDescription
-
-let package = Package(
-  name: "DshNotch",
-  platforms: [.macOS(.v14)],
-  products: [
-    .executable(name: "dsh-notch", targets: ["DshNotch"]),
-  ],
-  targets: [
-    .executableTarget(
-      name: "DshNotch",
-      path: "Sources",
-      resources: [.copy("Resources/Idle")]
-    ),
-  ]
-)

package/macos/STATUS-MOTION.md

@@ -1,49 +0,0 @@
-# Notch status motion
-
-Request: the existing rotating blue stroke moves continuously up into a green completion count, or down into a red failure count. It returns to the blue running count only if work remains. A fluid crossing curve takes precedence over a literal figure eight. Native SwiftUI helper; same black edge-attached shell, colors and rounded system numerals; no model calls for acceptance.
-
-Motion purpose: continuity between running and outcome. Single local stroke, 0.95 seconds; counts stay readable, clicks remain available. Success above running, failure below. No pop, ripple or separate flying droplet. Initial history must not replay completion. New events are queued/coalesced by outcome; no overlapping flights. Reduced Motion skips travel and displays current counts immediately. Last task finishes at its destination instead of inventing a running task.
-
-| Active reference | Decision | Artifact | Verification |
-| --- | --- | --- | --- |
-| motion-language | one migrating stroke, directional status semantics; static counts survive | StatusOrbitView | sampled native frames and guided live simulation |
-| motion-contract | explicit start/end, queued events, reduced motion | StatusFlight and OrbitMotionFrame | phase/path checks; repeated-event and final-task checks |
-
-Taste: preserve compact black shell, one thin status stroke and rounded numeric type. The memorable element is continuous status transfer, not decoration. Geometry stays inside shell bounds. Native rendering replaces browser motion validation because this is AppKit/SwiftUI.
-
-Acceptance: inspect success and failure separately with the user; animation builds/tests alone do not establish naturalness. Existing hover and screen-height regressions must remain passing.
-
-## Final brush implementation and Apple references
-
-User correction: the moving object is a short painted stroke with a moving head and trailing tail, not a translated ring. Success/failure settle as stationary solid disks. The route begins on the current rotating arc, follows its circle to a tangent exit, draws towards the outcome, traces its boundary, fills it, then rejoins the source arc if the flight started with work remaining. Counts have fixed spatial slots. A single monotonic arc-length timeline avoids velocity resets at path-segment boundaries. RGB interpolation stays continuous. The solid disks and numeral backgrounds occlude a returning trail so it cannot paint through numbers.
-
-The upward-success/downward-failure mapping and brush metaphor are this product's choices, not an Apple-provided animation. They apply Apple's guidance on purposeful, brief, consistent feedback and preserving user control:
-- https://developer.apple.com/design/human-interface-guidelines/motion
-- https://developer.apple.com/design/human-interface-guidelines/feedback
-- https://developer.apple.com/design/human-interface-guidelines/accessibility
-
-Motion never blocks click routing. An animation's return decision is fixed at its start so subsequent results cannot teleport its head; subsequent outcomes are queued. Reduced Motion renders the final disks/counts and a static running arc. No DSH model calls occur in the acceptance harness.
-
-## Return colour and compact layout correction
-
-The visible return trail uses a spatial result-to-blue gradient: the portion nearest the solid disk retains its result colour until it emerges, then blends into blue at the source rim. This prevents a hidden head from recolouring the entire visible tail too early. Compact height uses actual visible lamps: 44/72/100 points for one/two/three lamps, with the native panel geometry transition. Empty outcome slots are not reserved. Rendered corridor pixels and actual window heights are verified in this revision.
-
-## Idle robot (0.2.0)
-
-Native vector frames sampled from OpenBotMotion plus nine original local pose timelines. Canvas interpolates 30 fps samples at display cadence. No browser process or model invocation. Neutral pose separates actions. Rare dance uses original speed; first/last geometry and colors blend back to neutral.
-
-Task arrival freezes current pose and contracts it into the running ring over 300 ms. Clearing all results expands a central dot into the robot over 400 ms, eyes appearing last. Reversal retains current progress and geometry, and resumes the interrupted idle clip rather than snapping to neutral. Timer generations reject stale callbacks.
-
-Checks: 10 resources present, all vector frames inside native drawing bounds, immediate idle cancellation, reverse continuity, and existing native motion/geometry probes. Native helper installed separately from the unchanged Host.
-
-## 审核共享笔画（0.3.0）
-
-运行任务进入审核时新增 decision 笔画，沿当前蓝弧切线向上、途中变黄，描出目标圆后填充黄色并显示感叹号。只剩这个任务时收掉源槽；仍有任务时笔画回到蓝弧并更新运行数。审核、成功、失败共用 0.95 秒时序。审核自动展开等待笔画结束；问题已取消时不会由旧回调展开。
-
-最后一个任务的蓝色数字和黑色遮罩随笔画离开源头淡出，避免结果圈靠近时出现蓝字重影或黑块遮挡。`sh macos/Tests/outcome.sh` 覆盖三种结果的单/双任务场景、重复事件、取消与排队；三个既有原生脚本已补齐 Markdown 编译依赖。
-
-### 决策回复回程（0.3.0）
-
-`DecisionReturn` 独立持有回复的 presentation clock，`BoardModel` 从同一行的 needsAction → busy 边沿启动它。单任务保留 `DecisionMorph` 的原位画环；有剩余工作时使用 `OrbitBrushRoute` 已有返回段，从黄圈抽出笔画接回蓝环。数字在笔画进入目标圆周后渐变；最终笔尖角速度匹配持续旋转速度。黄填充清空后才同步收槽，避免两颗实心灯叠在一起。
-
-快速回复会排在黄色去程后，重复快照不重启，旧回调按 UUID 拒绝。面板正在折叠时，回程时钟等 0.4 秒再开始；取消且未恢复该任务不会把其他工作计数加一。此处演示和测试均使用本地快照，不调用 DSH 模型。正式 helper 与离线演示使用相同状态动画源码。

package/macos/Sources/Client.swift

@@ -1,139 +0,0 @@
-import Foundation
-
-struct RuntimeFile: Decodable {
-  var origin: String
-  var token: String
-}
-
-struct NotchOption: Decodable, Identifiable {
-  var label: String
-  var description: String?
-  var id: String { label }
-}
-
-struct NotchQuestion: Decodable, Identifiable {
-  var id: String
-  var question: String
-  var detail: String?
-  var header: String?
-  var options: [NotchOption]?
-  var multiSelect: Bool?
-}
-
-struct NotchApproval: Decodable {
-  var id: String
-  var toolName: String
-  var reason: String?
-}
-
-struct NotchAsk: Decodable {
-  var id: String
-  var questions: [NotchQuestion]
-}
-
-struct NotchLastTurn: Decodable {
-  var at: Double
-  var kind: String
-  var failed: Bool
-}
-
-struct NotchRow: Decodable, Identifiable {
-  var id: String
-  var title: String
-  var child: Bool
-  var busy: Bool
-  var unread: Bool
-  var lastTurn: NotchLastTurn?
-  var approval: NotchApproval?
-  var ask: NotchAsk?
-
-  var needsAction: Bool { approval != nil || ask != nil }
-  /// A red lamp is a finished unsuccessful turn, never a session that is still running.
-  var isFailedResult: Bool { lastTurn?.failed == true && !busy && !needsAction }
-}
-
-struct NotchSnapshot: Decodable {
-  var ok: Bool
-  var generatedAt: Double
-  var origin: String
-  var rows: [NotchRow]
-}
-
-enum NotchClientError: Error {
-  case noRuntime
-  case http(Int)
-}
-
-final class NotchClient: @unchecked Sendable {
-  private var origin = ""
-  private var token = ""
-
-  func reloadRuntime() throws {
-    let url = ProcessInfo.processInfo.environment["DSH_NOTCH_RUNTIME_FILE"].map { URL(fileURLWithPath: $0) }
-      ?? FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".dsh/dsh-notch/runtime.json")
-    let data = try Data(contentsOf: url)
-    let file = try JSONDecoder().decode(RuntimeFile.self, from: data)
-    origin = file.origin
-    token = file.token
-  }
-
-  func status() async throws -> NotchSnapshot {
-    try reloadRuntime()
-    return try await get("/dsh-notch/status")
-  }
-
-  func approve(id: String, outcome: String) async throws {
-    try await post("/dsh-notch/approve", body: ["id": id, "outcome": outcome])
-  }
-
-  @MainActor
-  func answer(id: String, answers: [[String: Any]]) async throws {
-    try await postJSON("/dsh-notch/answer", payload: ["id": id, "answers": answers])
-  }
-
-  func seen(sessionId: String) async throws {
-    try await post("/dsh-notch/seen", body: ["sessionId": sessionId])
-  }
-
-  func seenAll() async throws {
-    try await postJSON("/dsh-notch/seen", payload: ["all": true])
-  }
-
-  func focus(sessionId: String) async throws {
-    try await post("/dsh-notch/focus", body: ["sessionId": sessionId])
-  }
-
-  private func get(_ path: String) async throws -> NotchSnapshot {
-    var request = try makeRequest(path)
-    request.httpMethod = "GET"
-    let (data, response) = try await URLSession.shared.data(for: request)
-    try throwIfBad(response)
-    return try JSONDecoder().decode(NotchSnapshot.self, from: data)
-  }
-
-  private func post(_ path: String, body: [String: String]) async throws {
-    try await postJSON(path, payload: body)
-  }
-
-  private func postJSON(_ path: String, payload: [String: Any]) async throws {
-    var request = try makeRequest(path)
-    request.httpMethod = "POST"
-    request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-    request.httpBody = try JSONSerialization.data(withJSONObject: payload)
-    let (_, response) = try await URLSession.shared.data(for: request)
-    try throwIfBad(response)
-  }
-
-  private func makeRequest(_ path: String) throws -> URLRequest {
-    if origin.isEmpty { try reloadRuntime() }
-    guard let url = URL(string: origin + path) else { throw NotchClientError.noRuntime }
-    var request = URLRequest(url: url, timeoutInterval: 8)
-    request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
-    return request
-  }
-
-  private func throwIfBad(_ response: URLResponse) throws {
-    let status = (response as? HTTPURLResponse)?.statusCode ?? 0
-    if status < 200 || status >= 300 { throw NotchClientError.http(status) }
-  }
-}