@kidsinai/kids-client 0.0.22 → 0.0.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kidsinai/kids-client",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "type": "module",
   "description": "Own-client TUI for Kids OpenCode — talks to local `opencode serve` via @opencode-ai/sdk v2 with kid-warm rendering, mission progress, permission dialog, and stderr-tail audit pipeline.",
   "license": "MIT",

package/src/core/models.ts

@@ -17,8 +17,13 @@ export async function listModels(client: OpencodeClient): Promise<ModelChoice[]>
   }
   let raw: unknown
   try {
-    if (typeof api.provider?.list === "function") raw = await api.provider.list()
-    else if (typeof api.config?.providers === "function") raw = await api.config.providers()
+    // Prefer config.providers: it returns the configured/usable providers as
+    // { providers:[{id,models:[…]}], default } which flattenModels understands.
+    // provider.list returns the full models.dev catalog in a different shape
+    // ({ all, connected, default }) that flattens to 0 — that mismatch was why
+    // the /model picker showed "No models available". Verified vs serve 1.15.x.
+    if (typeof api.config?.providers === "function") raw = await api.config.providers()
+    else if (typeof api.provider?.list === "function") raw = await api.provider.list()
     else return []
   } catch {
     return []

package/src/core/serve-manager.ts

@@ -12,6 +12,21 @@
 import { spawn, type Subprocess } from "bun"
 import { buildAuthHeader } from "./connection.ts"
 
+/**
+ * Overall budget for the readiness poll. First boot in a large repo (file
+ * watcher + git + plugin load) can take >10s, so give it room before we
+ * surface a serve_unreachable error.
+ */
+const DEFAULT_READY_TIMEOUT_MS = 30_000
+/**
+ * Per-probe ceiling. CRITICAL: Bun's `fetch` has no default timeout, so a
+ * serve that ACCEPTS the connection but stalls mid-bootstrap (holds `/app`
+ * open without sending headers) would hang the probe — and therefore
+ * `ensureReady()` — forever, freezing the kid on "Starting AI engine…". An
+ * AbortSignal bounds every probe so a stuck serve becomes a retry, not a hang.
+ */
+const DEFAULT_PROBE_TIMEOUT_MS = 2_000
+
 export type ServeReadiness =
   | { kind: "already_running" }
   | { kind: "spawned"; pid: number }
@@ -41,8 +56,10 @@ export interface ServeManagerOptions {
    */
   serverUsername: string
   opencodeBin: string
-  /** Max wait for readiness probe in ms. Default 10s. */
+  /** Max total wait for readiness in ms. Default {@link DEFAULT_READY_TIMEOUT_MS}. */
   readyTimeoutMs?: number
+  /** Per-probe abort ceiling in ms. Default {@link DEFAULT_PROBE_TIMEOUT_MS}. */
+  probeTimeoutMs?: number
   /** Called for every parsed `[kids-audit]` JSON line on stderr. */
   onAuditLine?: (event: unknown) => void
   /** Called for every other (non-audit) stderr line. Useful for debug log. */
@@ -92,7 +109,7 @@ export class ServeManager {
 
     if (proc.stderr) void this.pipeStderr(proc.stderr)
 
-    const timeout = this.opts.readyTimeoutMs ?? 10_000
+    const timeout = this.opts.readyTimeoutMs ?? DEFAULT_READY_TIMEOUT_MS
     const start = Date.now()
     let lastError = "no response"
     while (Date.now() - start < timeout) {
@@ -132,9 +149,14 @@ export class ServeManager {
         headers: {
           authorization: buildAuthHeader(this.opts.serverUsername, this.opts.serverPassword),
         },
+        // Without this, a serve that accepts the socket but stalls mid-boot
+        // hangs the probe forever (Bun fetch has no default timeout).
+        signal: AbortSignal.timeout(this.opts.probeTimeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS),
       })
       return classifyProbeStatus(res.status)
     } catch {
+      // AbortError (timeout) and connection-refused both land here → treat as
+      // "nobody answering yet" so ensureReady() retries instead of freezing.
       return "offline"
     }
   }

package/src/core/session.ts

@@ -67,11 +67,13 @@ export class SessionManager {
    */
   async loadMessages(sessionID: string): Promise<ChatMessage[]> {
     this.currentSessionId = sessionID
-    const api = (this.client as unknown as { session?: { messages?: (p: unknown) => Promise<unknown> } }).session
+    const api = (this.client as unknown as { session?: { messages?: (p: unknown, o?: unknown) => Promise<unknown> } }).session
     if (typeof api?.messages !== "function") return []
     let raw: unknown
     try {
-      raw = await api.messages({ sessionID, order: "asc", limit: 200 })
+      // SDK v2 flat params: `sessionID` → path, `limit` → query. There is no
+      // `order` param — the route already returns messages chronologically.
+      raw = await api.messages({ sessionID, limit: 200 }, SDK_THROW)
     } catch {
       return []
     }
@@ -104,15 +106,18 @@ export class SessionManager {
     const sessionID = this.currentSessionId!
     const api = (this.client as unknown as { session?: { prompt: (parameters: unknown, options?: unknown) => Promise<unknown> } }).session
     if (!api?.prompt) throw new Error("SDK v2: client.session.prompt unavailable")
-    // SDK 1.14.51 signature: single parameters object, kid's text under .prompt.text.
-    // Pass SDK_THROW so 4xx/5xx surface as exceptions instead of getting
-    // silently swallowed (the bug behind the "thinking…" hang).
+    // SDK v2 prompt takes ONE flat params object; buildClientParams routes
+    // `sessionID` → URL path and `parts`/`model`/`agent` → body. A flat
+    // { sessionID, prompt:{text} } leaves body undefined — serve 1.15.x rejects
+    // it ("Expected object" / "Missing key parts"), which surfaced as endless
+    // "thinking…" then a Network-trouble error. Verified against 1.15.x: this
+    // shape returns 200. Pass SDK_THROW so 4xx/5xx surface as exceptions.
     // `model` (from the /model picker) is a "providerID/modelID" string; the SDK
     // wants it split into { providerID, modelID }.
     const model = splitModelId(opts?.model)
     const payload = {
       sessionID,
-      prompt: { text },
+      parts: [{ type: "text", text }],
       ...(model ? { model } : {}),
       ...(opts?.agent ? { agent: opts.agent } : {}),
     }
@@ -163,38 +168,43 @@ function splitModelId(id: string | undefined): { providerID: string; modelID: st
 
 /** session.messages returns `{ items }` or `{ data: { items } }`. */
 function unwrapItems(result: unknown): unknown[] {
+  if (Array.isArray(result)) return result
   if (result && typeof result === "object") {
-    const r = result as { items?: unknown; data?: { items?: unknown } }
+    const r = result as { items?: unknown; data?: unknown }
     if (Array.isArray(r.items)) return r.items
-    if (Array.isArray(r.data?.items)) return r.data!.items as unknown[]
+    // SDK v2 with throwOnError returns { data: T[], request, response }.
+    if (Array.isArray(r.data)) return r.data
+    const di = (r.data as { items?: unknown })?.items
+    if (Array.isArray(di)) return di
   }
   return []
 }
 
-/** Map a server SessionMessage to our ChatMessage; null = skip (tool/control). */
+/**
+ * Map a server SessionMessage to our ChatMessage; null = skip (tool/control).
+ *
+ * SDK v2 list items are `{ info: Message, parts: Part[] }`: the role/id/time
+ * live on `info`, and the visible text is the concatenation of the `text`
+ * parts. (The pre-v2 flat `{ type, text, content }` shape no longer applies.)
+ */
 export function mapServerMessage(m: unknown): ChatMessage | null {
   if (!m || typeof m !== "object") return null
   const o = m as {
-    id?: string
-    type?: string
-    text?: string
-    content?: Array<{ type?: string; text?: string }>
-    time?: { created?: number }
-  }
-  const id = o.id ?? `srv-${o.time?.created ?? 0}`
-  const ts = typeof o.time?.created === "number" ? o.time.created : 0
-  if (o.type === "user" && typeof o.text === "string") {
-    return { id, actor: "kid", text: o.text, streaming: false, ts }
-  }
-  if (o.type === "assistant" && Array.isArray(o.content)) {
-    const text = o.content
-      .filter((p) => p?.type === "text" && typeof p.text === "string")
-      .map((p) => p.text)
-      .join("")
-      .trim()
-    if (!text) return null
-    return { id, actor: "agent", text, streaming: false, ts }
-  }
+    info?: { id?: string; role?: string; time?: { created?: number } }
+    parts?: Array<{ type?: string; text?: string }>
+  }
+  const info = o.info
+  if (!info || typeof info !== "object") return null
+  const id = info.id ?? `srv-${info.time?.created ?? 0}`
+  const ts = typeof info.time?.created === "number" ? info.time.created : 0
+  const text = (Array.isArray(o.parts) ? o.parts : [])
+    .filter((p) => p?.type === "text" && typeof p.text === "string")
+    .map((p) => p.text)
+    .join("")
+    .trim()
+  if (!text) return null
+  if (info.role === "user") return { id, actor: "kid", text, streaming: false, ts }
+  if (info.role === "assistant") return { id, actor: "agent", text, streaming: false, ts }
   return null
 }
 

package/src/index.tsx

@@ -54,7 +54,7 @@ interface ServiceSet {
 }
 
 interface FullHandlers {
-  onStart: (mode: "free" | "course" | "resume" | "help") => void
+  onStart: (mode: "free" | "course" | "resume" | "help" | "settings") => void
   onPrompt: (text: string) => Promise<void>
   onPermissionReply: (decision: "allow" | "deny" | "edit") => Promise<void>
   onAbort: () => Promise<void>
@@ -66,7 +66,7 @@ interface FullHandlers {
 }
 
 interface AppHandlers {
-  onStart: (mode: "free" | "course" | "resume" | "help") => void
+  onStart: (mode: "free" | "course" | "resume" | "help" | "settings") => void
   onPrompt: (text: string) => void
   onPermissionReply: (decision: "allow" | "deny" | "edit") => void
   onDangerousAcknowledge: () => void
@@ -212,7 +212,7 @@ function makeHandlers(
   }
 
   return {
-    onStart: ifBooted((s, mode: "free" | "course" | "resume" | "help") => s.handlers.onStart(mode)),
+    onStart: ifBooted((s, mode: "free" | "course" | "resume" | "help" | "settings") => s.handlers.onStart(mode)),
     onPrompt: ifBooted((s, text: string) => s.handlers.onPrompt(text)),
     onPermissionReply: ifBooted((s, d: "allow" | "deny" | "edit") => s.handlers.onPermissionReply(d)),
     onDangerousAcknowledge: () => store.update({ dangerousTopic: null }),
@@ -571,6 +571,11 @@ function makeFullHandlers(
         store.update({ screen: { kind: "help" } })
         return
       }
+      if (mode === "settings") {
+        // Re-open the setup wizard to change provider / API key / model.
+        store.update({ screen: { kind: "setup" } })
+        return
+      }
       if (mode === "course") {
         store.update({ screen: { kind: "course_picker" } })
         return
@@ -650,7 +655,8 @@ function makeFullHandlers(
       try {
         await session.prompt(text, { model: snap.selectedModel ?? undefined })
       } catch (err) {
-        store.update({ thinking: false, screen: { kind: "error", variant: "network_down", detail: errMessage(err) } })
+        const detail = errMessage(err)
+        store.update({ thinking: false, screen: { kind: "error", variant: classifyLlmError(detail), detail } })
       }
     },
     onPermissionReply: async (decision) => {
@@ -840,7 +846,7 @@ function handlePluginAudit(event: unknown, store: Store): void {
  * codes like WALLET_INSUFFICIENT / FAMILY_PAUSED (platform-backend §7) or
  * plain English ("insufficient credits", "rate limit", "402").
  */
-function classifyLlmError(msg: string): "stars_exhausted" | "network_down" {
+function classifyLlmError(msg: string): "stars_exhausted" | "auth_failed" | "network_down" {
   const m = msg.toLowerCase()
   if (
     m.includes("wallet_insufficient")
@@ -853,6 +859,21 @@ function classifyLlmError(msg: string): "stars_exhausted" | "network_down" {
   ) {
     return "stars_exhausted"
   }
+  // Auth/sign-in failures (e.g. ChatGPT OAuth token invalidated, 401) are NOT
+  // network problems — the fix is to re-authenticate, so route to the
+  // reconfigurable error screen instead of the dead-end "can't reach AI".
+  if (
+    m.includes("token_invalidated")
+    || m.includes("authentication token")
+    || m.includes("sign in again")
+    || m.includes("signing in")
+    || m.includes("invalidated")
+    || m.includes("unauthorized")
+    || m.includes("invalid_api_key")
+    || m.includes("401")
+  ) {
+    return "auth_failed"
+  }
   return "network_down"
 }
 

package/src/render/ink/App.tsx

@@ -42,7 +42,7 @@ export interface AppDeps {
   store: Store
   locale: "zh-Hans" | "en"
   installedPacks: InstalledPack[]
-  onStart: (mode: "free" | "course" | "resume" | "help") => void
+  onStart: (mode: "free" | "course" | "resume" | "help" | "settings") => void
   onPrompt: (text: string) => void
   onPermissionReply: (decision: "allow" | "deny" | "edit") => void
   onDangerousAcknowledge: () => void
@@ -106,7 +106,10 @@ export function App(deps: AppDeps): React.ReactElement {
 
   const screen = renderScreen(state, deps)
   return (
-    <Box width={width} height={height} flexDirection="column">
+    // paddingTop gives every screen a row of breathing room instead of being
+    // glued to the terminal's top edge. It's constant, so the App's footprint
+    // still never changes between renders (see the height-lock note above).
+    <Box width={width} height={height} flexDirection="column" paddingTop={1}>
       {screen}
     </Box>
   )

package/src/render/ink/screens/StartupScreen.tsx

@@ -23,7 +23,7 @@ interface StartupScreenProps {
   locale: "zh-Hans" | "en"
   coursePack: string | null
   toast: ToastState | null
-  onStart: (mode: "free" | "course" | "resume" | "help") => void
+  onStart: (mode: "free" | "course" | "resume" | "help" | "settings") => void
   onOpenWallet: () => void
   onQuit: () => void
 }
@@ -36,6 +36,7 @@ export function StartupScreen({ locale, coursePack, toast, onStart, onOpenWallet
     else if (input === "f") onStart("free")
     else if (input === "r") onStart("resume")
     else if (input === "w" || input === "W") onOpenWallet()
+    else if (input === "s" || input === "S") onStart("settings")
     else if (input === "h") onStart("help")
     else if (input === "q" || input === "Q") onQuit()
   })
@@ -64,6 +65,7 @@ export function StartupScreen({ locale, coursePack, toast, onStart, onOpenWallet
           { key: "f", label: t.startFree },
           { key: "r", label: t.resume },
           { key: "w", label: t.wallet },
+          { key: "s", label: t.settings },
           { key: "h", label: t.help },
           { key: "q", label: t.quit },
         ]} />
@@ -90,6 +92,7 @@ const STRINGS = {
     pickCourse: "选 Course Pack",
     resume: "继续上次",
     wallet: "钱包 / 充值（开浏览器）",
+    settings: "设置 / 换模型",
     help: "帮助",
     quit: "退出",
   },
@@ -105,6 +108,7 @@ const STRINGS = {
     pickCourse: "Pick a Course Pack",
     resume: "Resume last session",
     wallet: "Wallet / Top up (opens browser)",
+    settings: "Settings / change model",
     help: "Help",
     quit: "Quit",
   },