@zhin.js/client 2.0.3 → 2.0.5

package/client/agent-stream.ts

@@ -0,0 +1,121 @@
+import {
+  AGENT_STREAM_MEDIA_TYPE,
+  ZHIN_AGENT_SESSION_API_PREFIX,
+  ZHIN_SESSION_ID_HEADER,
+  foldAgentStreamNdjson,
+  iterateAgentStreamNdjson,
+  type AgentStreamEvent,
+  type AgentStreamReduceState,
+  type ContinueAgentSessionResponse,
+  type FoldAgentStreamOptions,
+  type StartAgentSessionResponse,
+} from "@zhin.js/contract";
+import { getToken, resolveApiUrl } from "./console-utils/remoteApi.js";
+
+export type AgentStreamClientOptions = {
+  fetch?: typeof fetch;
+};
+
+function resolveFetch(options?: AgentStreamClientOptions): typeof fetch {
+  const impl = options?.fetch ?? globalThis.fetch;
+  if (!impl) throw new Error("fetch is not available");
+  return impl;
+}
+
+async function authedFetch(
+  path: string,
+  init: RequestInit,
+  fetchImpl: typeof fetch,
+): Promise<Response> {
+  const token = getToken();
+  const headers = new Headers(init.headers);
+  if (token) headers.set("Authorization", `Bearer ${token}`);
+  const url = path.startsWith("/") ? resolveApiUrl(path) : path;
+  const res = await fetchImpl(url, { ...init, headers });
+  if (res.status === 401 && typeof localStorage !== "undefined") {
+    sessionStorage.removeItem("zhin_api_token");
+    localStorage.removeItem("zhin_api_token");
+    window.dispatchEvent(new CustomEvent("zhin:auth-required"));
+  }
+  return res;
+}
+
+async function readJson<T>(res: Response): Promise<T> {
+  if (!res.ok) {
+    const err = await res.json().catch(() => ({})) as { error?: string };
+    throw new Error(err.error ?? `HTTP ${res.status}`);
+  }
+  return res.json() as Promise<T>;
+}
+
+/** POST /zhin/v1/session — start a Host agent session turn. */
+export async function startAgentSession(
+  message: string,
+  options?: AgentStreamClientOptions,
+): Promise<StartAgentSessionResponse> {
+  const fetchImpl = resolveFetch(options);
+  const res = await authedFetch(`${ZHIN_AGENT_SESSION_API_PREFIX}/session`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ message }),
+  }, fetchImpl);
+  return readJson<StartAgentSessionResponse>(res);
+}
+
+/** POST /zhin/v1/session/:sessionId — continue with continuationToken + message. */
+export async function continueAgentSession(
+  sessionId: string,
+  continuationToken: string,
+  message: string,
+  options?: AgentStreamClientOptions,
+): Promise<ContinueAgentSessionResponse> {
+  const fetchImpl = resolveFetch(options);
+  const res = await authedFetch(
+    `${ZHIN_AGENT_SESSION_API_PREFIX}/session/${encodeURIComponent(sessionId)}`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ continuationToken, message }),
+    },
+    fetchImpl,
+  );
+  return readJson<ContinueAgentSessionResponse>(res);
+}
+
+export type SubscribeAgentStreamOptions = FoldAgentStreamOptions & {
+  startIndex?: number;
+  fetch?: typeof fetch;
+  onEvent?: (event: AgentStreamEvent, state: AgentStreamReduceState) => void;
+};
+
+/** GET /zhin/v1/session/:sessionId/stream — consume NDJSON until the stream closes. */
+export async function subscribeAgentStream(
+  sessionId: string,
+  options?: SubscribeAgentStreamOptions,
+): Promise<AgentStreamReduceState> {
+  const fetchImpl = resolveFetch(options);
+  const startIndex = options?.startIndex ?? 0;
+  const query = startIndex > 0 ? `?startIndex=${startIndex}` : "";
+  const res = await authedFetch(
+    `${ZHIN_AGENT_SESSION_API_PREFIX}/session/${encodeURIComponent(sessionId)}/stream${query}`,
+    {
+      method: "GET",
+      headers: { Accept: AGENT_STREAM_MEDIA_TYPE },
+    },
+    fetchImpl,
+  );
+  if (!res.ok) {
+    const err = await res.json().catch(() => ({})) as { error?: string };
+    throw new Error(err.error ?? `HTTP ${res.status}`);
+  }
+  const headerSessionId = res.headers.get(ZHIN_SESSION_ID_HEADER);
+  if (headerSessionId && headerSessionId !== sessionId) {
+    throw new Error(`stream session id mismatch: ${headerSessionId}`);
+  }
+  if (!res.body) {
+    throw new Error("stream response has no body");
+  }
+  return foldAgentStreamNdjson(res.body, options);
+}
+
+export { iterateAgentStreamNdjson, foldAgentStreamNdjson };

package/client/bootstrap/loadConsoleEntries.ts

@@ -1,10 +1,4 @@
-import type {
-  ConsoleClientEntry,
-  ConsoleEntriesResponse,
-  ConsolePluginRegister,
-  PluginRegisterHostApi,
-} from "@zhin.js/contract";
-import { DEFAULT_CONSOLE_BASE_PATH } from "@zhin.js/contract";
+import { DEFAULT_CONSOLE_BASE_PATH, type ConsoleClientEntry, type ConsoleEntriesResponse, type ConsolePluginRegister, type PluginRegisterHostApi } from '@zhin.js/contract';
 
 export type FetchConsoleEntriesOptions = {
   entriesUrl?: string;

package/client/console-utils/remoteApi.ts

@@ -3,13 +3,13 @@ const API_BASE_KEY = "zhin_api_base";
 
 export function getApiBase(): string {
   const stored = localStorage.getItem(API_BASE_KEY)?.trim();
-  if (stored) return stored.replace(/\/$/, "");
+  if (stored) return trimTrailingSlash(stored);
   if (typeof window !== "undefined") return window.location.origin;
   return "";
 }
 
 export function getToken(): string | null {
-  return localStorage.getItem(TOKEN_KEY);
+  return getRuntimeToken() ?? localStorage.getItem(TOKEN_KEY);
 }
 
 export function resolveApiUrl(path: string): string {
@@ -41,8 +41,19 @@ export async function apiFetch(
 
   const res = await fetch(url, { ...init, headers });
   if (res.status === 401) {
+    sessionStorage.removeItem(TOKEN_KEY);
     localStorage.removeItem(TOKEN_KEY);
     window.dispatchEvent(new CustomEvent("zhin:auth-required"));
   }
   return res;
 }
+
+function trimTrailingSlash(value: string): string {
+  return value.endsWith("/") ? value.slice(0, -1) : value;
+}
+
+function getRuntimeToken(): string | null {
+  if (typeof window === "undefined") return null;
+  const token = (window as unknown as { __ZHIN_API_TOKEN?: string }).__ZHIN_API_TOKEN;
+  return token?.trim() || null;
+}

package/client/index.ts

@@ -4,6 +4,9 @@ export * from "./types";
 // Media URL resolution
 export { resolveMediaSrc, pickMediaRawUrl, type MediaKind } from "./mediaSrc";
 
+// Segment IM visibility (inbox vs agent panel)
+export { segmentsForImDelivery, segmentsForAgentPanel } from "./segments.js";
+
 // Console app singleton (pagemanager / registry style)
 export {
   app,
@@ -47,3 +50,16 @@ export {
   type FetchConsoleEntriesOptions,
   type LoadConsoleEntriesOptions,
 } from "./bootstrap/loadConsoleEntries.js";
+
+export { registerOrchestrationConsole } from "./orchestration/registerOrchestrationConsole.js";
+export { default as OrchestrationRunsPage } from "./orchestration/OrchestrationRunsPage.js";
+
+export {
+  startAgentSession,
+  continueAgentSession,
+  subscribeAgentStream,
+  iterateAgentStreamNdjson,
+  foldAgentStreamNdjson,
+  type AgentStreamClientOptions,
+  type SubscribeAgentStreamOptions,
+} from "./agent-stream.js";

package/client/mediaSrc.ts

@@ -43,9 +43,14 @@ export function resolveMediaSrc(
   return `data:${defaultMime};base64,${b64}`
 }
 
-/** 从 segment.data 取常见媒体字段 */
+/** 从 segment.data 取常见媒体字段（优先 canonical MediaRef） */
 export function pickMediaRawUrl(data: Record<string, unknown> | undefined): string | undefined {
   if (!data) return undefined
+  const media = data.media
+  if (media && typeof media === 'object' && media !== null) {
+    const value = (media as { value?: unknown }).value
+    if (typeof value === 'string' && value.trim()) return value.trim()
+  }
   const v = data.url ?? data.file ?? data.src ?? data.href
   return typeof v === 'string' && v.trim() ? v.trim() : undefined
 }

package/client/orchestration/OrchestrationRunsPage.tsx

@@ -0,0 +1,217 @@
+import { useCallback, useState } from 'react';
+import { apiFetch } from '../console-utils/remoteApi.js';
+
+type OrchestrationTaskRow = {
+  id: string;
+  name: string;
+  status: string;
+  executor_kind?: string;
+  assigned_to?: string;
+  result_summary?: string;
+  error?: string;
+};
+
+type OrchestrationEventRow = {
+  seq: number;
+  type: string;
+  task_id?: string;
+  payload_json?: string;
+  created_at?: number;
+};
+
+type RunListItem = {
+  run: { id: string; session_key: string; status: string; title: string };
+  tasks: OrchestrationTaskRow[];
+};
+
+type RunDetail = RunListItem & {
+  events?: OrchestrationEventRow[];
+};
+
+function parsePayload(raw?: string): string {
+  if (!raw?.trim()) return '';
+  try {
+    const parsed = JSON.parse(raw) as Record<string, unknown>;
+    return JSON.stringify(parsed, null, 2);
+  } catch {
+    return raw;
+  }
+}
+
+export default function OrchestrationRunsPage() {
+  const [sessionKey, setSessionKey] = useState('');
+  const [runs, setRuns] = useState<RunListItem[]>([]);
+  const [selected, setSelected] = useState<RunDetail | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState('');
+
+  const loadRuns = useCallback(async () => {
+    if (!sessionKey.trim()) {
+      setError('请输入 sessionKey');
+      return;
+    }
+    setLoading(true);
+    setError('');
+    setSelected(null);
+    try {
+      const res = await apiFetch(
+        `/api/agent/orchestration/runs?sessionKey=${encodeURIComponent(sessionKey.trim())}`,
+      );
+      const body = await res.json() as { success?: boolean; error?: string; data?: { runs?: RunListItem[] } };
+      if (!res.ok || !body.success) {
+        throw new Error(body.error ?? `HTTP ${res.status}`);
+      }
+      setRuns(body.data?.runs ?? []);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+      setRuns([]);
+    } finally {
+      setLoading(false);
+    }
+  }, [sessionKey]);
+
+  const loadRunDetail = useCallback(async (runId: string) => {
+    setLoading(true);
+    setError('');
+    try {
+      const res = await apiFetch(`/api/agent/orchestration/runs/${encodeURIComponent(runId)}`);
+      const body = await res.json() as { success?: boolean; error?: string; data?: RunDetail };
+      if (!res.ok || !body.success || !body.data) {
+        throw new Error(body.error ?? `HTTP ${res.status}`);
+      }
+      setSelected(body.data);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  return (
+    <div className="p-4 space-y-4 max-w-5xl">
+      <h1 className="text-lg font-semibold">编排 Run / Task / Event</h1>
+      <p className="text-sm text-muted-foreground">
+        从 OrchestrationKernel 投影（`GET /api/agent/orchestration/*`）。sessionKey 格式：
+        <code className="mx-1">platform:endpointId:kind:sceneId</code>
+      </p>
+
+      <div className="flex flex-wrap gap-2 items-end">
+        <label className="flex flex-col gap-1 text-sm flex-1 min-w-[240px]">
+          sessionKey
+          <input
+            className="border rounded px-2 py-1 text-sm bg-background"
+            value={sessionKey}
+            onChange={(e) => setSessionKey(e.target.value)}
+            placeholder="sandbox:solo-bot:private:user1"
+          />
+        </label>
+        <button
+          type="button"
+          className="border rounded px-3 py-1 text-sm hover:bg-muted"
+          disabled={loading}
+          onClick={() => void loadRuns()}
+        >
+          查询 Runs
+        </button>
+      </div>
+
+      {error ? <p className="text-sm text-red-600">{error}</p> : null}
+
+      <div className="grid gap-4 md:grid-cols-2">
+        <section className="border rounded p-3 space-y-2">
+          <h2 className="text-sm font-medium">Runs ({runs.length})</h2>
+          {runs.length === 0 ? (
+            <p className="text-sm text-muted-foreground">无数据</p>
+          ) : (
+            <ul className="space-y-2 text-sm">
+              {runs.map((item) => (
+                <li key={item.run.id} className="border rounded p-2">
+                  <button
+                    type="button"
+                    className="text-left w-full hover:underline"
+                    onClick={() => void loadRunDetail(item.run.id)}
+                  >
+                    <div className="font-mono text-xs">{item.run.id}</div>
+                    <div>{item.run.title || '(无标题)'}</div>
+                    <div className="text-muted-foreground">
+                      {item.run.status}
+                      {' · '}
+                      {item.tasks.length}
+                      {' tasks'}
+                    </div>
+                  </button>
+                </li>
+              ))}
+            </ul>
+          )}
+        </section>
+
+        <section className="border rounded p-3 space-y-3">
+          <h2 className="text-sm font-medium">Run 详情</h2>
+          {!selected ? (
+            <p className="text-sm text-muted-foreground">选择左侧 Run</p>
+          ) : (
+            <>
+              <div className="text-sm space-y-1">
+                <div>
+                  <span className="text-muted-foreground">ID </span>
+                  <code>{selected.run.id}</code>
+                </div>
+                <div>
+                  <span className="text-muted-foreground">状态 </span>
+                  {selected.run.status}
+                </div>
+              </div>
+
+              <div>
+                <h3 className="text-xs font-medium uppercase text-muted-foreground mb-1">Tasks</h3>
+                <ul className="space-y-2 text-sm">
+                  {selected.tasks.map((task) => (
+                    <li key={task.id} className="border rounded p-2 font-mono text-xs">
+                      <div>
+                        {task.id}
+                        {' · '}
+                        {task.status}
+                        {' · '}
+                        {task.executor_kind ?? 'local'}
+                      </div>
+                      <div>{task.name}</div>
+                      {task.result_summary ? (
+                        <div className="mt-1 whitespace-pre-wrap break-words">{task.result_summary}</div>
+                      ) : null}
+                      {task.error ? (
+                        <div className="mt-1 text-red-600 whitespace-pre-wrap">{task.error}</div>
+                      ) : null}
+                    </li>
+                  ))}
+                </ul>
+              </div>
+
+              <div>
+                <h3 className="text-xs font-medium uppercase text-muted-foreground mb-1">Events</h3>
+                <ul className="space-y-2 text-xs max-h-64 overflow-auto">
+                  {(selected.events ?? []).map((ev) => (
+                    <li key={ev.seq} className="border rounded p-2">
+                      <div>
+                        #
+                        {ev.seq}
+                        {' '}
+                        {ev.type}
+                        {ev.task_id ? ` · task ${ev.task_id}` : ''}
+                      </div>
+                      {ev.payload_json ? (
+                        <pre className="mt-1 whitespace-pre-wrap break-words text-[10px] opacity-80">
+                          {parsePayload(ev.payload_json)}
+                        </pre>
+                      ) : null}
+                    </li>
+                  ))}
+                </ul>
+              </div>
+            </>
+          )}
+        </section>
+      </div>
+    </div>
+  );
+}

package/client/orchestration/registerOrchestrationConsole.test.ts

@@ -0,0 +1,26 @@
+import { describe, expect, it, vi } from 'vitest';
+import { registerOrchestrationConsole } from './registerOrchestrationConsole.js';
+
+describe('registerOrchestrationConsole', () => {
+  it('registers orchestration route and tool', () => {
+    const addRoute = vi.fn();
+    const addTool = vi.fn();
+    const React = { createElement: vi.fn((type) => ({ type })) };
+
+    registerOrchestrationConsole({
+      React: React as never,
+      addRoute,
+      addPage: addRoute,
+      addTool,
+    });
+
+    expect(addRoute).toHaveBeenCalledWith(expect.objectContaining({
+      path: '/console/orchestration',
+      name: '编排',
+    }));
+    expect(addTool).toHaveBeenCalledWith(expect.objectContaining({
+      id: 'orchestration',
+      path: '/console/orchestration',
+    }));
+  });
+});

package/client/orchestration/registerOrchestrationConsole.ts

@@ -0,0 +1,17 @@
+import type { PluginRegisterHostApi } from '@zhin.js/contract';
+import OrchestrationRunsPage from './OrchestrationRunsPage.js';
+
+/** Remote Console v1.1 — OrchestrationKernel Run/Task/Event 投影页 */
+export function registerOrchestrationConsole(api: PluginRegisterHostApi): void {
+  api.addRoute({
+    path: '/console/orchestration',
+    name: '编排',
+    element: api.React.createElement(OrchestrationRunsPage),
+    meta: { order: 40, group: 'Agent' },
+  });
+  api.addTool({
+    id: 'orchestration',
+    name: '编排',
+    path: '/console/orchestration',
+  });
+}

package/client/persistence/idb-store.ts

@@ -1,12 +1,12 @@
 const DB_NAME = "zhin-console";
-const DB_VERSION = 1;
+const DB_VERSION = 2;
 const STORE_INBOX = "inbox";
 const STORE_PENDING = "pending";
 
 export type InboxRecord = {
   id: string;
   adapter: string;
-  endpointId: string;
+  endpoint_id: string;
   kind: "message" | "request" | "notice";
   payload: unknown;
   updatedAt: number;
@@ -42,7 +42,7 @@ export async function idbPutInbox(record: InboxRecord): Promise<void> {
 
 export async function idbListInbox(
   adapter: string,
-  endpointId: string,
+  endpoint_id: string,
   kind: InboxRecord["kind"],
 ): Promise<InboxRecord[]> {
   const db = await openDb();
@@ -53,22 +53,28 @@ export async function idbListInbox(
     req.onerror = () => reject(req.error);
   });
   db.close();
-  return all.filter((r) => r.adapter === adapter && r.endpointId === endpointId && r.kind === kind);
+  return all.filter(
+    (r) =>
+      r.adapter === adapter &&
+      (r.endpoint_id === endpoint_id ||
+        (r as { endpointId?: string }).endpointId === endpoint_id) &&
+      r.kind === kind,
+  );
 }
 
 export async function applyConsoleEvent(event: { type: string; data?: unknown }): Promise<void> {
   const t = event.type;
-  if (t === "endpoint:message" || t === "endpoint:request" || t === "endpoint:notice") {
+  if (t === "message.receive" || t === "request.receive" || t === "notice.receive") {
     const data = event.data as Record<string, unknown> | undefined;
     if (!data) return;
-    const adapter = String(data.adapter ?? "");
-    const endpointId = String(data.endpointId ?? data.bot ?? "");
-    const id = `${adapter}:${endpointId}:${t}:${Date.now()}`;
+    const adapter = String(data.$adapter ?? data.adapter ?? "");
+    const endpoint_id = String(data.$endpoint ?? data.endpoint_id ?? data.endpointId ?? data.bot ?? "");
+    const id = `${adapter}:${endpoint_id}:${t}:${Date.now()}`;
     await idbPutInbox({
       id,
       adapter,
-      endpointId,
-      kind: t === "endpoint:message" ? "message" : t === "endpoint:request" ? "request" : "notice",
+      endpoint_id,
+      kind: t === "message.receive" ? "message" : t === "request.receive" ? "request" : "notice",
       payload: data,
       updatedAt: Date.now(),
     });

package/client/segments.test.ts

@@ -0,0 +1,16 @@
+import { describe, expect, it } from 'vitest';
+import { segmentsForAgentPanel, segmentsForImDelivery } from '../client/segments.js';
+
+describe('console segmentsForImDelivery', () => {
+  it('inbox view strips AI-only segments', () => {
+    const full = [
+      { type: 'thinking', data: { text: 'plan' } },
+      { type: 'text', data: { text: 'hi' } },
+      { type: 'tool_call', data: { name: 'bash' } },
+    ];
+    expect(segmentsForImDelivery(full)).toEqual([
+      { type: 'text', data: { text: 'hi' } },
+    ]);
+    expect(segmentsForAgentPanel(full)).toEqual(full);
+  });
+});

package/client/segments.ts

@@ -0,0 +1,39 @@
+import type { MessageSegment } from './types.js';
+
+/** IM 可见段白名单（与 core segment-contract/delivery 对齐） */
+const IM_VISIBLE_TYPES = new Set([
+  'text', 'mention', 'image', 'video', 'audio', 'voice', 'record', 'file',
+  'face', 'reply', 'forward', 'link', 'dice', 'rps', 'markdown', 'html',
+  'qrcode', 'tts', 'keyboard', 'action',
+]);
+
+const AI_ONLY_TYPES = new Set(['thinking', 'tool_call']);
+
+function isSegmentLike(value: unknown): value is MessageSegment {
+  return (
+    typeof value === 'object'
+    && value !== null
+    && typeof (value as MessageSegment).type === 'string'
+    && 'data' in value
+  );
+}
+
+/**
+ * Inbox / 用户 IM 视图：仅展示 IM-visible 段（剔除 thinking、tool_call）。
+ * Agent 面板应使用全量 segments，勿调用此函数。
+ */
+export function segmentsForImDelivery(segments: readonly unknown[]): MessageSegment[] {
+  const out: MessageSegment[] = [];
+  for (const item of segments) {
+    if (!isSegmentLike(item)) continue;
+    if (AI_ONLY_TYPES.has(item.type)) continue;
+    if (!IM_VISIBLE_TYPES.has(item.type)) continue;
+    out.push(item);
+  }
+  return out;
+}
+
+/** Agent 面板全量 segments（identity，便于双视图 API 对称） */
+export function segmentsForAgentPanel(segments: readonly MessageSegment[]): MessageSegment[] {
+  return [...segments];
+}

package/client/types.ts

@@ -1,8 +1,9 @@
-// 消息段类型定义 - 客户端版本
+// 消息段类型定义 - 客户端版本（对齐 core Segment SSOT）
 export interface MessageSegment {
-  /** record：如 ICQQ 语音等，展示时按音频处理 */
-  type: 'text' | 'image' | 'at' | 'face' | 'video' | 'audio' | 'record' | 'file' | 'reply'
-  data: Record<string, any>
+  /** record：如 ICQQ 语音等，展示时按音频处理；thinking/tool_call 仅 agent 面板展示 */
+  type: 'text' | 'mention' | 'at' | 'image' | 'face' | 'video' | 'audio' | 'record' | 'file' | 'reply' | 'forward' | 'keyboard' | 'action' | 'thinking' | 'tool_call' | string
+  data: Record<string, unknown>
+  platform?: Record<string, unknown>
 }
 
 // 消息元素别名（兼容不同命名习惯）
@@ -10,4 +11,3 @@ export type MessageElement = MessageSegment
 
 // 发送内容类型
 export type SendContent = MessageSegment | MessageSegment[] | string
-

package/client/websocket/manager.ts

@@ -1,15 +1,5 @@
-import type {
-  WebSocketMessage,
-  WebSocketConfig,
-  WebSocketCallbacks,
-} from "./types";
-import {
-  ConnectionState,
-  WebSocketError,
-  ConnectionError,
-  MessageError,
-  RequestTimeoutError,
-} from "./types";
+import { ConnectionState, WebSocketError, ConnectionError, MessageError, RequestTimeoutError, type WebSocketMessage, type WebSocketConfig, type WebSocketCallbacks } from './types';
+
 import { getApiBase, getStoredToken, resolveApiUrl } from "./remote-settings.js";
 import { applyConsoleEvent } from "../persistence/idb-store.js";
 
@@ -350,7 +340,7 @@ export class WebSocketManager {
 
   private handleBroadcast(message: WebSocketMessage): void {
     const t = message.type;
-    if (t === "endpoint:request" || t === "endpoint:notice" || t === "endpoint:message") {
+    if (t === "request.receive" || t === "notice.receive" || t === "message.receive") {
       if (typeof window !== "undefined") {
         window.dispatchEvent(new CustomEvent("zhin-console-bot-push", { detail: message }));
       }

package/client/websocket/remote-settings.ts

@@ -3,7 +3,7 @@ const TOKEN_KEY = "zhin_api_token";
 
 export function getApiBase(): string {
   const stored = localStorage.getItem(API_BASE_KEY)?.trim();
-  if (stored) return stored.replace(/\/$/, "");
+  if (stored) return trimTrailingSlash(stored);
   if (typeof window !== "undefined") {
     return window.location.origin;
   }
@@ -11,11 +11,11 @@ export function getApiBase(): string {
 }
 
 export function setApiBase(base: string): void {
-  localStorage.setItem(API_BASE_KEY, base.replace(/\/$/, ""));
+  localStorage.setItem(API_BASE_KEY, trimTrailingSlash(base));
 }
 
 export function getStoredToken(): string | null {
-  return localStorage.getItem(TOKEN_KEY);
+  return getRuntimeToken() ?? localStorage.getItem(TOKEN_KEY);
 }
 
 export function resolveApiUrl(path: string): string {
@@ -23,3 +23,13 @@ export function resolveApiUrl(path: string): string {
   const p = path.startsWith("/") ? path : `/${path}`;
   return `${base}${p}`;
 }
+
+function trimTrailingSlash(value: string): string {
+  return value.endsWith("/") ? value.slice(0, -1) : value;
+}
+
+function getRuntimeToken(): string | null {
+  if (typeof window === "undefined") return null;
+  const token = (window as unknown as { __ZHIN_API_TOKEN?: string }).__ZHIN_API_TOKEN;
+  return token?.trim() || null;
+}