@stevezhou/sisu 0.2.2 → 0.3.0

package/dist/commands.js

@@ -339,7 +339,8 @@ async function setTrainingCommand(optIn, http = http_1.defaultHttp) {
 }
 async function listModelsCommand(http = http_1.defaultHttp) {
     const { models, defaultModel } = await (0, models_1.fetchModelCatalog)(http);
-    const current = (0, store_1.readSession)().last_model || defaultModel;
+    const last = (0, store_1.readSession)().last_model || '';
+    const current = models.some((row) => row.name === last) ? last : defaultModel;
     if (!current && !models.length)
         return 'no models available';
     const lines = models.map((row) => {
@@ -347,9 +348,6 @@ async function listModelsCommand(http = http_1.defaultHttp) {
         const extra = row.label !== row.name ? `  ${row.label}` : '';
         return `${mark}${row.name}${extra}`;
     });
-    if (current && !models.some((row) => row.name === current)) {
-        lines.unshift(`* ${current}`);
-    }
     return lines.join('\n') || `* ${current}`;
 }
 async function setModelCommand(query, http = http_1.defaultHttp) {

package/dist/runtime/adapter.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toProviderMessages = toProviderMessages;
 exports.completeUrl = completeUrl;
 exports.openaiCompatUrl = openaiCompatUrl;
+exports.completeHeaders = completeHeaders;
 exports.buildCompleteRequest = buildCompleteRequest;
 exports.isServerSideAgentPayload = isServerSideAgentPayload;
 exports.parseCompleteSse = parseCompleteSse;
@@ -11,6 +12,7 @@ exports.createSisuCloudModel = createSisuCloudModel;
 const client_1 = require("../client");
 const http_1 = require("../http");
 const sse_1 = require("../sse");
+const store_1 = require("../store");
 const suite_1 = require("./suite");
 /** OpenAI/Poe wire: assistant.tool_calls is {id,type,function:{name,arguments:string}}. */
 function toProviderMessages(messages) {
@@ -39,6 +41,12 @@ function completeUrl(apiBase) {
 function openaiCompatUrl(apiBase) {
     return `${apiBase.replace(/\/+$/, '')}${suite_1.OPENAI_COMPAT_PATH}`;
 }
+function completeHeaders(token) {
+    return {
+        ...(0, http_1.authHeaders)(token),
+        'x-sisu-conversation-id': (0, store_1.ensureConversationId)(),
+    };
+}
 function buildCompleteRequest(request, options = {}) {
     const stamp = (0, client_1.clientStamp)(options.client || 'cli');
     return {
@@ -135,7 +143,7 @@ function createSisuCloudModel(http, options) {
             }
             const sent = await http(completeUrl(options.apiBase), {
                 method: 'POST',
-                headers: (0, http_1.authHeaders)(options.token),
+                headers: completeHeaders(options.token),
                 body: JSON.stringify(payload),
             });
             if (!sent.ok) {

package/dist/runtime/launch.js

@@ -61,17 +61,22 @@ function sisuGrokBuildEnv() {
     const auth = (0, store_1.readAuth)();
     const home = (0, store_1.getSisuHome)();
     const runtimeBase = auth ? sisuRuntimeApiBase(auth.api_base) : '';
+    const env = { ...process.env };
+    delete env.GROK_DEFAULT_MODEL;
     return {
-        ...process.env,
+        ...env,
         GROK_HOME: process.env.GROK_HOME || home,
         SISU_HOME: home,
         GROK_TELEMETRY_ENABLED: process.env.GROK_TELEMETRY_ENABLED || '0',
         XAI_API_KEY: process.env.XAI_API_KEY || auth?.token || '',
         SISU_API_BASE: auth?.api_base || process.env.SISU_API_BASE || 'https://www.sisu.chat',
+        SISU_CONVERSATION_ID: (0, store_1.ensureConversationId)(),
         ...(runtimeBase
             ? {
                 GROK_XAI_API_BASE_URL: runtimeBase,
                 XAI_API_BASE_URL: runtimeBase,
+                GROK_MODELS_BASE_URL: runtimeBase,
+                GROK_MODELS_LIST_URL: `${runtimeBase}/models`,
             }
             : {}),
     };

package/dist/runtime/models.js

@@ -8,23 +8,27 @@ const store_1 = require("../store");
 function normalizeModelKey(value) {
     return value.toLowerCase().replace(/[-_.\s]/g, '');
 }
-async function fetchModelCatalog(http = http_1.defaultHttp) {
-    const auth = (0, store_1.requireAuth)();
-    const response = await http(`${auth.api_base}/api/chat/models`, { headers: (0, http_1.authHeaders)(auth.token) });
-    const body = await response.json().catch(() => ({}));
-    if (!response.ok)
-        throw new Error((0, http_1.errorDetail)(body, `models failed (${response.status})`));
-    const rows = Array.isArray(body?.models) ? body.models : [];
+function parseRuntimeCatalog(body) {
+    const rows = Array.isArray(body?.data) ? body.data : [];
     const models = rows
         .map((row) => {
-        const name = String(row?.name || '').trim();
+        const name = String(row?.id || row?.name || '').trim();
         if (!name)
             return null;
-        return { name, label: String(row.display_name || row.label || name) };
+        return { name, label: String(row?.name || row?.id || name).trim() || name };
     })
         .filter((row) => Boolean(row));
     return { models, defaultModel: String(body?.default_model || '') };
 }
+async function fetchModelCatalog(http = http_1.defaultHttp) {
+    const auth = (0, store_1.requireAuth)();
+    const headers = (0, http_1.authHeaders)(auth.token);
+    const runtime = await http(`${auth.api_base}/api/runtime/v1/models`, { headers });
+    if (runtime.ok)
+        return parseRuntimeCatalog(await runtime.json().catch(() => ({})));
+    const body = await runtime.json().catch(() => ({}));
+    throw new Error((0, http_1.errorDetail)(body, `models failed (${runtime.status})`));
+}
 function resolveCatalogModel(query, models) {
     const needle = normalizeModelKey(query);
     if (!needle)

package/dist/store.js

@@ -9,11 +9,13 @@ exports.readAuth = readAuth;
 exports.writeAuth = writeAuth;
 exports.readSession = readSession;
 exports.writeSession = writeSession;
+exports.ensureConversationId = ensureConversationId;
 exports.clearAuth = clearAuth;
 exports.readWorkspaces = readWorkspaces;
 exports.bindWorkspace = bindWorkspace;
 exports.requireAuth = requireAuth;
 exports.describeStatus = describeStatus;
+const crypto_1 = require("crypto");
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -79,6 +81,7 @@ function readAuth() {
     };
 }
 function writeAuth(record) {
+    const previous = readAuth();
     writeJson(authPath(), {
         token: record.token,
         email: record.email,
@@ -87,6 +90,12 @@ function writeAuth(record) {
         plan_code: record.plan_code || '',
         name: record.name || '',
     });
+    if (previous && previous.user_id !== record.user_id) {
+        const session = readSession();
+        if (session.last_conversation_id) {
+            writeSession({ ...session, last_conversation_id: undefined });
+        }
+    }
 }
 function readSession() {
     return readJson(sessionPath(), {});
@@ -94,6 +103,16 @@ function readSession() {
 function writeSession(record) {
     writeJson(sessionPath(), record);
 }
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function ensureConversationId() {
+    const session = readSession();
+    const current = String(session.last_conversation_id || '').trim();
+    if (UUID_RE.test(current))
+        return current;
+    const id = (0, crypto_1.randomUUID)();
+    writeSession({ ...session, last_conversation_id: id });
+    return id;
+}
 function clearAuth() {
     try {
         fs_1.default.unlinkSync(authPath());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stevezhou/sisu",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "SiSu CLI — 思溯 / SiSu · 思有所溯",
   "license": "UNLICENSED",
   "homepage": "https://www.sisu.chat",