@stevezhou/sisu 0.3.6 → 0.3.8

package/dist/commands.js

@@ -26,7 +26,6 @@ const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const http_1 = require("./http");
-const adapter_1 = require("./runtime/adapter");
 const loop_1 = require("./runtime/loop");
 const models_1 = require("./runtime/models");
 Object.defineProperty(exports, "fetchModelCatalog", { enumerable: true, get: function () { return models_1.fetchModelCatalog; } });
@@ -265,9 +264,7 @@ function resolveBoundWorkspace(projectId) {
         throw new Error('no local workspace — run sisu open <dir> --project <id>');
     throw new Error('multiple workspaces — pass --project');
 }
-function listLocalCommand(projectId) {
-    (0, store_1.requireAuth)();
-    const bound = resolveBoundWorkspace(projectId);
+function formatDirListing(bound) {
     const names = fs_1.default.readdirSync(bound.path).filter((name) => !name.startsWith('.'));
     if (!names.length)
         return `${bound.path} (empty)`;
@@ -277,24 +274,31 @@ function listLocalCommand(projectId) {
         return `${name}${suffix}`;
     }).join('\n');
 }
+function listLocalCommand(projectId) {
+    (0, store_1.requireAuth)();
+    const workspaces = (0, store_1.readWorkspaces)();
+    const requested = (projectId || '').trim();
+    if (requested) {
+        if (!workspaces[requested])
+            throw new Error(`unknown workspace ${requested}`);
+        return formatDirListing({ projectId: requested, path: workspaces[requested] });
+    }
+    const entries = Object.entries(workspaces);
+    if (!entries.length)
+        throw new Error('no local workspace — run sisu open <dir> --project <id>');
+    if (entries.length === 1)
+        return formatDirListing({ projectId: entries[0][0], path: entries[0][1] });
+    return entries.map(([id, dir]) => `${id}  ${dir}`).join('\n');
+}
 async function execCommand(prompt, options = {}, http = http_1.defaultHttp) {
     const text = prompt.trim();
     if (!text)
         throw new Error('prompt is required');
     const stub = Boolean(options.stub || process.env.SISU_RUNTIME_STUB === '1');
     const cwd = options.cwd || process.cwd();
-    const modelClient = options.modelClient || (stub
-        ? (0, loop_1.createLaunchStubModel)()
-        : (() => {
-            const auth = (0, store_1.requireAuth)();
-            return (0, adapter_1.createSisuCloudModel)(http, {
-                apiBase: auth.api_base,
-                token: auth.token,
-                client: options.client || 'cli',
-            });
-        })());
     if (!stub)
         (0, store_1.requireAuth)();
+    const modelClient = options.modelClient || (stub ? (0, loop_1.createLaunchStubModel)() : undefined);
     if (options.projectId) {
         (0, store_1.writeSession)({ ...(0, store_1.readSession)(), last_project_id: options.projectId });
     }
@@ -312,7 +316,7 @@ async function execCommand(prompt, options = {}, http = http_1.defaultHttp) {
 }
 async function listConversationsCommand(http = http_1.defaultHttp) {
     const auth = (0, store_1.requireAuth)();
-    const response = await http(`${auth.api_base}/api/chat/conversations?limit=30`, {
+    const response = await http(`${auth.api_base}/api/chat/conversations?source=cli&limit=30`, {
         headers: (0, http_1.authHeaders)(auth.token),
     });
     const body = await response.json().catch(() => []);
@@ -322,16 +326,37 @@ async function listConversationsCommand(http = http_1.defaultHttp) {
     if (!rows.length)
         return 'no saved conversations';
     return rows.map((row) => {
-        const client = row.client ? ` [${row.client}]` : '';
-        return `${row.id}  ${row.title || '(untitled)'}${client}`;
+        const tag = row.source || row.client;
+        const suffix = tag ? ` [${tag}]` : '';
+        return `${row.id}  ${row.title || '(untitled)'}${suffix}`;
     }).join('\n');
 }
-function openConversationCommand(conversationId) {
+async function openConversationCommand(conversationId, http = http_1.defaultHttp) {
     const id = conversationId.trim();
     if (!id)
         throw new Error('conversation id is required');
     (0, store_1.writeSession)({ ...(0, store_1.readSession)(), last_conversation_id: id });
-    return `opened ${id}`;
+    const auth = (0, store_1.requireAuth)();
+    const response = await http(`${auth.api_base}/api/chat/conversations/${id}`, {
+        headers: (0, http_1.authHeaders)(auth.token),
+    });
+    const body = await response.json().catch(() => ({}));
+    if (!response.ok)
+        throw new Error((0, http_1.errorDetail)(body, `thread failed (${response.status})`));
+    const messages = Array.isArray(body.messages) ? body.messages : [];
+    const lines = [`opened ${id}`];
+    if (body.title)
+        lines.push(String(body.title));
+    for (const msg of messages) {
+        const role = String(msg?.role || '').trim();
+        const content = String(msg?.content || '').trim();
+        if (!role || !content)
+            continue;
+        lines.push(`${role}: ${content}`);
+    }
+    if (lines.length === 1)
+        lines.push('(no messages)');
+    return lines.join('\n');
 }
 async function setTrainingCommand(optIn, http = http_1.defaultHttp) {
     const auth = (0, store_1.requireAuth)();

package/dist/main.js

@@ -163,18 +163,21 @@ async function runCli(argv, deps = {}) {
             model: parsed.flags['--model'],
             newConversation: parsed.switches.has('new'),
             stub: parsed.switches.has('stub') || process.env.SISU_RUNTIME_STUB === '1',
-        });
-        if (result.text)
+        }, http);
+        if (result.text.trim()) {
             process.stdout.write(`${result.text}\n`);
-        return 0;
+            return 0;
+        }
+        process.stderr.write('no model text\n');
+        return 1;
     }
     if (command === 'history') {
-        process.stdout.write(`${await (0, commands_1.listConversationsCommand)(http_1.defaultHttp)}\n`);
+        process.stdout.write(`${await (0, commands_1.listConversationsCommand)(http)}\n`);
         return 0;
     }
     if (command === 'thread') {
         const id = args.find((item) => !item.startsWith('--')) || '';
-        process.stdout.write(`${(0, commands_1.openConversationCommand)(id)}\n`);
+        process.stdout.write(`${await (0, commands_1.openConversationCommand)(id, http)}\n`);
         return 0;
     }
     if (command === 'models') {

package/dist/runtime/adapter.js

@@ -41,10 +41,10 @@ function completeUrl(apiBase) {
 function openaiCompatUrl(apiBase) {
     return `${apiBase.replace(/\/+$/, '')}${suite_1.OPENAI_COMPAT_PATH}`;
 }
-function completeHeaders(token) {
+function completeHeaders(token, conversationId) {
     return {
         ...(0, http_1.authHeaders)(token),
-        'x-sisu-conversation-id': (0, store_1.ensureConversationId)(),
+        'x-sisu-conversation-id': conversationId || (0, store_1.ensureConversationId)(),
     };
 }
 function buildCompleteRequest(request, options = {}) {
@@ -143,7 +143,7 @@ function createSisuCloudModel(http, options) {
             }
             const sent = await http(completeUrl(options.apiBase), {
                 method: 'POST',
-                headers: completeHeaders(options.token),
+                headers: completeHeaders(options.token, options.conversationId),
                 body: JSON.stringify(payload),
             });
             if (!sent.ok) {

package/dist/runtime/loop.js

@@ -23,7 +23,10 @@ async function* runLocalTurn(options) {
     for (let round = 0; round < maxRounds; round += 1) {
         const request = { model: options.model, messages: messages.map((row) => ({ ...row })), tools };
         requests.push(request);
-        const completion = await options.client.complete(request);
+        let completion = await options.client.complete(request);
+        if (!completion.text && !completion.tool_calls.length) {
+            completion = await options.client.complete(request);
+        }
         if (completion.text) {
             text += completion.text;
             yield { type: 'text', text: completion.text };

package/dist/runtime/sessions.js

@@ -17,9 +17,9 @@ function sessionsDir() {
 function sessionFile(id) {
     return path_1.default.join(sessionsDir(), `${id}.json`);
 }
-function createLocalSession(title, cwd, model) {
+function createLocalSession(title, cwd, model, id) {
     const session = {
-        id: (0, crypto_1.randomUUID)(),
+        id: id || (0, crypto_1.randomUUID)(),
         title: title.slice(0, 80) || 'session',
         cwd,
         model,

package/dist/runtime/transport.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLocalRuntimeTransport = createLocalRuntimeTransport;
 exports.execLocalTurn = execLocalTurn;
+const crypto_1 = require("crypto");
 const store_1 = require("../store");
 const adapter_1 = require("./adapter");
 const loop_1 = require("./loop");
@@ -15,11 +16,14 @@ function createLocalRuntimeTransport(http, options = {}) {
             let conversationId = sendOptions.conversationId || (!sendOptions.newConversation ? (0, store_1.readSession)().last_conversation_id : '') || '';
             let existing = conversationId ? (0, sessions_1.loadLocalSession)(conversationId) : null;
             if (!existing || sendOptions.newConversation) {
-                existing = (0, sessions_1.createLocalSession)(prompt.trim().slice(0, 50), cwd, (0, store_1.readSession)().last_model);
-                conversationId = existing.id;
+                conversationId = (0, crypto_1.randomUUID)();
+                (0, store_1.writeSession)({ ...(0, store_1.readSession)(), last_conversation_id: conversationId });
+                existing = (0, sessions_1.createLocalSession)(prompt.trim().slice(0, 50), cwd, (0, store_1.readSession)().last_model, conversationId);
             }
-            (0, store_1.writeSession)({ ...(0, store_1.readSession)(), last_conversation_id: conversationId });
-            const client = options.modelClient || cloudClient(http, options.client || 'tui');
+            else {
+                (0, store_1.writeSession)({ ...(0, store_1.readSession)(), last_conversation_id: conversationId });
+            }
+            const client = options.modelClient || cloudClient(http, options.client || 'tui', conversationId);
             const model = options.modelClient
                 ? existing.model || (0, store_1.readSession)().last_model || 'stub'
                 : await (0, models_1.resolveRuntimeModel)(http, { explicit: existing.model || (0, store_1.readSession)().last_model });
@@ -64,12 +68,15 @@ function createLocalRuntimeTransport(http, options = {}) {
 async function execLocalTurn(prompt, options = {}) {
     const cwd = (0, tools_1.resolveWorkspaceRoot)(options.cwd);
     let conversationId = options.conversationId || (!options.newConversation ? (0, store_1.readSession)().last_conversation_id : '') || '';
+    if (options.newConversation || !conversationId) {
+        conversationId = (0, crypto_1.randomUUID)();
+        (0, store_1.writeSession)({ ...(0, store_1.readSession)(), last_conversation_id: conversationId });
+    }
     let existing = conversationId ? (0, sessions_1.loadLocalSession)(conversationId) : null;
     if (!existing) {
-        existing = (0, sessions_1.createLocalSession)(prompt.trim().slice(0, 50), cwd, options.model);
-        conversationId = existing.id;
+        existing = (0, sessions_1.createLocalSession)(prompt.trim().slice(0, 50), cwd, options.model, conversationId);
     }
-    const client = options.modelClient || (options.http ? cloudClient(options.http, options.client || 'cli') : undefined);
+    const client = options.modelClient || (options.http ? cloudClient(options.http, options.client || 'cli', conversationId) : undefined);
     if (!client)
         throw new Error('model client required');
     const result = await (0, loop_1.collectLocalTurn)({
@@ -87,7 +94,12 @@ async function execLocalTurn(prompt, options = {}) {
     (0, store_1.writeSession)({ ...(0, store_1.readSession)(), last_conversation_id: result.conversationId, last_model: options.model || (0, store_1.readSession)().last_model });
     return { conversationId: result.conversationId, text: result.text, toolResults: result.toolResults };
 }
-function cloudClient(http, client) {
+function cloudClient(http, client, conversationId) {
     const auth = (0, store_1.requireAuth)();
-    return (0, adapter_1.createSisuCloudModel)(http, { apiBase: auth.api_base, token: auth.token, client });
+    return (0, adapter_1.createSisuCloudModel)(http, {
+        apiBase: auth.api_base,
+        token: auth.token,
+        client,
+        conversationId,
+    });
 }

package/dist/store.js

@@ -131,7 +131,21 @@ function clearAuth() {
 }
 function readWorkspaces() {
     const raw = readJson(workspacePath(), {});
-    return raw && typeof raw === 'object' ? raw : {};
+    if (!raw || typeof raw !== 'object')
+        return {};
+    const kept = {};
+    let dirty = false;
+    for (const [id, dir] of Object.entries(raw)) {
+        if (typeof dir === 'string' && dir && fs_1.default.existsSync(dir) && fs_1.default.statSync(dir).isDirectory()) {
+            kept[id] = dir;
+        }
+        else {
+            dirty = true;
+        }
+    }
+    if (dirty)
+        writeJson(workspacePath(), kept);
+    return kept;
 }
 function bindWorkspace(projectId, requestedPath) {
     if (!projectId.trim())

package/dist/tui.js

@@ -397,7 +397,7 @@ async function runTui(io, deps = {}) {
             }
             if (raw.startsWith('/open ')) {
                 try {
-                    io.write(`${openThread(raw.slice(6).trim())}\n`);
+                    io.write(`${await openThread(raw.slice(6).trim(), http)}\n`);
                     newConversation = false;
                 }
                 catch (error) {

package/package.json

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