model-compare-opencode-plugin 0.1.3 → 0.3.0

package/src/tui.tsx

@@ -68,7 +68,7 @@ import {
   type AliasView,
 } from "./opencode/usebest"
 import type { ReportEntry } from "./opencode/commands"
-import { sanitizeCatalogText } from "./opencode/commands"
+import { lastResponseLine, sanitizeCatalogText } from "./opencode/commands"
 import { ModelCompare } from "./rpc"
 
 const TOAST_MS = 6_000
@@ -81,6 +81,11 @@ const PACKAGE_FRAGMENT = "model-compare-opencode-plugin"
 // The RPC event the /model-compare command emits (see src/rpc.ts; the wire
 // name is prefixed with the RPC's id).
 const REPORT_EVENT = "rpc.model-compare.report"
+// The event the runtime hook emits once per session when it would have
+// steered a request but has no steering data (no catalog source) — the Q2
+// fallback's runtime notification. The toast copy below is the whole message.
+const CANNOT_STEER_EVENT = "rpc.model-compare.cannotSteer"
+const CANNOT_STEER_COPY = "cannot steer this session; OpenRouter default routing applies"
 
 // The list dialogs' lifecycle token (see showListDialog): a module-scope
 // generation counter, bumped every time a dialog is armed, plus the armed
@@ -189,6 +194,30 @@ function toReportEntries(raw: unknown): ReportEntry[] {
   })
 }
 
+// The report payload's footer capture (the last-response line and the alt+e
+// toast's data), defensively normalized at the trust boundary like the
+// entries: anything but a well-shaped object — or one without an endpoint —
+// degrades to null (no capture), never a placeholder line.
+function toCapture(raw: unknown): { endpoint: string; model: string; downgrade: boolean } | null {
+  if (typeof raw !== "object" || raw === null) return null
+  const capture = raw as { endpoint?: unknown; model?: unknown; downgrade?: unknown }
+  if (typeof capture.endpoint !== "string" || capture.endpoint === "") return null
+  return {
+    endpoint: capture.endpoint,
+    // The Task-5 handoff: a capture may carry an empty model (a response
+    // whose provider had no model id) — carried as-is, and the footer omits
+    // the model part rather than rendering an empty slot.
+    model: typeof capture.model === "string" ? capture.model : "",
+    downgrade: capture.downgrade === true,
+  }
+}
+
+// The footer's steering note, defensively normalized: anything but a
+// non-empty string means the note does not render (no steering data).
+function toSteeringNote(raw: unknown): string | null {
+  return typeof raw === "string" && raw !== "" ? raw : null
+}
+
 export default Plugin.define({
   id: "model-compare-tui",
   async setup(context) {
@@ -236,6 +265,8 @@ export default Plugin.define({
       sessionID: string
       age: string | null
       entries: ReportEntry[]
+      capture: { endpoint: string; model: string; downgrade: boolean } | null
+      steeringNote: string | null
     } | null>(null)
 
     // The registry view, reactive: OpenCode's data layer updates the list
@@ -387,7 +418,15 @@ export default Plugin.define({
       pick: () => void
     } | null>(null)
 
-    function showListDialog(title: string, rows: ListRow[], onPick: (value: string) => void): void {
+    function showListDialog(
+      title: string,
+      rows: ListRow[],
+      onPick: (value: string) => void,
+      // The footer's extra lines (the report dialog's steering note and
+      // last-response line), rendered muted ABOVE the Details line. Absent
+      // for the other dialogs (the picks dialog carries no footer lines).
+      footerLines: string[] = [],
+    ): void {
       const selectable = rows.filter((row) => row.value !== undefined)
       if (selectable.length === 0) {
         notify("nothing to select", "error")
@@ -604,8 +643,13 @@ export default Plugin.define({
                 })
               })()}
             </scrollbox>
+            {footerLines.map((line) => (
+              <box paddingLeft={4}>
+                <text fg={muted}>{line}</text>
+              </box>
+            ))}
             <box paddingLeft={4}>
-              <text fg={muted}>Details: https://canonical.github.io/model-compare</text>
+              <text fg={muted}>Details: https://model-compare.dev</text>
             </box>
           </box>
         ),
@@ -652,6 +696,11 @@ export default Plugin.define({
       sessionID: string | null
       age: string | null
       entries: ReportEntry[]
+      // The footer (design §Steering visibility, the user's option C): the
+      // steering note above the last-response line, both omitted when their
+      // data is absent — never a placeholder.
+      capture: { endpoint: string; model: string; downgrade: boolean } | null
+      steeringNote: string | null
     }): void {
       if (data.entries.length === 0) {
         notify("no ranking data available yet", "error")
@@ -718,12 +767,20 @@ export default Plugin.define({
           })
         }
       }
+      // The report dialog's footer (design §Decisions, option C): the
+      // steering note ABOVE the last-response line, both omitted when their
+      // data is absent — never a placeholder line.
+      const footerLines: string[] = []
+      if (data.steeringNote !== null) footerLines.push(data.steeringNote)
+      const lastResponse = lastResponseLine(data.capture)
+      if (lastResponse !== null) footerLines.push(lastResponse)
       showListDialog(
         `Model Compare — top 5 (data age: ${data.age ?? "unknown"})`,
         rows,
         (id) => {
-          if (data.sessionID !== null) {
-            void switchToModel(data.sessionID, id)
+          const sessionID = data.sessionID
+          if (sessionID !== null) {
+            void switchToModel(sessionID, id)
             return
           }
           // The opening screen: the pick becomes a NEW session's model —
@@ -733,6 +790,7 @@ export default Plugin.define({
             `switched to openrouter/${sanitizeCatalogText(id)}`,
           )
         },
+        footerLines,
       )
     }
 
@@ -745,7 +803,13 @@ export default Plugin.define({
       const event = details as {
         type?: unknown
         location?: { directory?: unknown }
-        data?: { sessionID?: unknown; age?: unknown; entries?: unknown }
+        data?: {
+          sessionID?: unknown
+          age?: unknown
+          entries?: unknown
+          capture?: unknown
+          steeringNote?: unknown
+        }
       }
       if (event.type !== REPORT_EVENT) return
       if (
@@ -760,14 +824,46 @@ export default Plugin.define({
       const entries = toReportEntries(data.entries)
       const eventSessionID = data.sessionID
       // Ownerless callback: park the report on the signal — the app slot's
-      // in-tree effect opens the dialog (see pendingReport above).
+      // in-tree effect opens the dialog (see pendingReport above). The
+      // footer's fields ride the payload like the entries (defensively
+      // normalized at this trust boundary).
       setPendingReport({
         sessionID: eventSessionID,
         age: typeof data.age === "string" ? data.age : null,
         entries,
+        capture: toCapture(data.capture),
+        steeringNote: toSteeringNote(data.steeringNote),
       })
     })
 
+    // The cannot-steer fallback (Task 6): the runtime hook emits this event
+    // once per session when a steerable alias request finds no steering data
+    // (no catalog source). The TUI surfaces it as a toast with the exact
+    // fallback copy; headless shows nothing — like every TUI-coupled surface.
+    // Scoped exactly like the report listener: a foreign directory's session
+    // is never viewable here, and only the CURRENTLY viewed session toasts.
+    // Trade-off: a cannotSteer notice for a same-project background session
+    // (or a session the user isn't currently viewing) is dropped forever —
+    // the emit is once-per-session — but noise from unopened sessions is the
+    // worse failure; the notice is about the session the user interacts with.
+    const offCannotSteerEvent = context.data.listen(({ details }) => {
+      const event = details as {
+        type?: unknown
+        location?: { directory?: unknown }
+        data?: { sessionID?: unknown }
+      }
+      if (event.type !== CANNOT_STEER_EVENT) return
+      if (
+        typeof event.location?.directory === "string" &&
+        here !== undefined &&
+        event.location.directory !== here
+      )
+        return
+      const data = event.data
+      if (typeof data?.sessionID !== "string" || data.sessionID !== currentSessionID()) return
+      notify(CANNOT_STEER_COPY)
+    })
+
     createRoot((dispose) => {
       disposeRoot = dispose
 
@@ -882,11 +978,15 @@ export default Plugin.define({
             {},
             here === undefined ? undefined : { location: { directory: here } },
           )
-          const data = report as { age?: unknown; entries?: unknown } | undefined
+          const data = report as
+            | { age?: unknown; entries?: unknown; capture?: unknown; steeringNote?: unknown }
+            | undefined
           showReportDialog({
             sessionID: null,
             age: typeof data?.age === "string" ? data.age : null,
             entries: toReportEntries(data?.entries),
+            capture: toCapture(data?.capture),
+            steeringNote: toSteeringNote(data?.steeringNote),
           })
         } catch (error) {
           notify(`report failed: ${error instanceof Error ? error.message : String(error)}`, "error")
@@ -894,6 +994,45 @@ export default Plugin.define({
       },
     }
 
+    // The served-endpoint toast (design §Steering visibility): alt+e toasts
+    // the CURRENT session's last response's served endpoint, looked up
+    // through the report RPC's footer fields (the capture record rides the
+    // established report payload path). The copy is exact — normal:
+    // "last response served by <endpoint>"; downgrade (the served provider
+    // matched none of the applied steering order): "! served by <endpoint> —
+    // not in steering order"; nothing toasts when nothing was captured for
+    // the session (and with no session open there is nothing to look up).
+    const endpointCommand: KeymapCommand = {
+      id: "model-compare.endpoint",
+      title: "Last served endpoint",
+      group: "Model Compare",
+      bind: "alt+e",
+      palette: true,
+      run: async () => {
+        const sessionID = currentSessionID()
+        if (sessionID === null) return
+        try {
+          const report: unknown = await context.client.rpc(ModelCompare).report(
+            { sessionID },
+            here === undefined ? undefined : { location: { directory: here } },
+          )
+          const capture = toCapture((report as { capture?: unknown } | undefined)?.capture)
+          if (capture === null) return
+          // F-20: the endpoint is response data — flattened for the toast.
+          notify(
+            capture.downgrade
+              ? `! served by ${sanitizeCatalogText(capture.endpoint)} — not in steering order`
+              : `last response served by ${sanitizeCatalogText(capture.endpoint)}`,
+          )
+        } catch (error) {
+          notify(
+            `endpoint lookup failed: ${error instanceof Error ? error.message : String(error)}`,
+            "error",
+          )
+        }
+      },
+    }
+
     // The palette-only use-best: the immediate-toast variant. The SLASH
     // surface is left to the server command (one entry everywhere); the
     // palette is TUI-layer territory, where this variant's instant feedback
@@ -974,7 +1113,7 @@ export default Plugin.define({
         try {
           context.keymap.layer(() => ({
             mode: "global",
-            commands: [useBestCommand, picksCommand, reportCommand],
+            commands: [useBestCommand, picksCommand, reportCommand, endpointCommand],
           }))
         } catch (error) {
           layerFailure("the model-compare keymap layer", error)
@@ -992,6 +1131,7 @@ export default Plugin.define({
       if (resyncTimer !== undefined) clearInterval(resyncTimer)
       context.renderer.off("resize", onRendererResize)
       offReportEvent()
+      offCannotSteerEvent()
       disposeRoot()
       disposeAppSlot()
       disposeHomeFooter()

package/vendor/UPSTREAM.json

@@ -1,6 +1,6 @@
 {
   "repo": "canonical/model-compare",
-  "tag": "v0.3.1",
-  "commit": "fb873265fb687b79ba828ae3561355360645cd0b",
-  "sha256": "9c50207254d260cc442d7e65aaa17b5ce025ee9c1778fe131054ac74a78594e1"
+  "tag": "v0.4.0",
+  "commit": "6f4b59f93fec4bbad3068c531d401c91cb9a2ce9",
+  "sha256": "f70b3e02811c5d5dc53a4f23d5a0d1efa2b03ceda9124c5ad7b2013412b00135"
 }