u1s1-cli 1.2.3 → 1.2.4

package/dist/deploy.js

@@ -123,13 +123,13 @@ export function parseDeployArgs(args) {
     }
     return parsed;
 }
-async function api(cfg, method, path, body) {
+async function api(cfg, request) {
     let resp;
     try {
-        resp = await authorizedFetch(cfg, `${cfg.baseUrl}${path}`, {
-            method,
+        resp = await authorizedFetch(cfg, `${cfg.baseUrl}${request.path}`, {
+            method: request.method,
             headers: { "x-u1s1-version": VERSION, "content-type": "application/json" },
-            body: body === undefined ? undefined : JSON.stringify(body),
+            body: request.body === undefined ? undefined : JSON.stringify(request.body),
             signal: AbortSignal.timeout(30_000),
         });
     }
@@ -208,35 +208,30 @@ async function promptVisibility() {
         rl.close();
     }
 }
-export async function deployCommand(cfg, args) {
-    // 参数:[dir] [--name xxx] [--public|--private];u1s1 deploy list 列出已有站点
-    if (args[0] === "list") {
-        const { sites } = await api(cfg, "GET", "/deploy/sites");
-        if (!sites.length) {
-            console.log("  还没有部署过站点。在网页目录里跑 u1s1 deploy 试试。");
-            return;
-        }
-        // 服务端给的是 UTC 时间戳,转成本地时间展示
-        const fmtTime = (ts) => {
-            const d = new Date(ts.includes("T") ? ts : `${ts.replace(" ", "T")}Z`);
-            return Number.isNaN(d.getTime()) ? ts : d.toLocaleString("zh-CN", { hour12: false });
-        };
-        console.log("");
-        for (const s of sites) {
-            const visibility = s.visibility === "private" ? "私密" : s.community_listed ? "公开(社区)" : "公开(未展示)";
-            console.log(`  ${s.deployed ? "●" : "○"} ${s.url}  ${visibility} · ${fmtBytes(s.total_bytes)} · ${s.updated_at} UTC`);
-        }
-        console.log("");
+async function listDeployments(cfg) {
+    const { sites } = await api(cfg, { method: "GET", path: "/deploy/sites" });
+    if (!sites.length) {
+        console.log("  还没有部署过站点。在网页目录里跑 u1s1 deploy 试试。");
         return;
     }
+    console.log("");
+    for (const site of sites) {
+        const visibility = site.visibility === "private"
+            ? "私密"
+            : site.community_listed ? "公开(社区)" : "公开(未展示)";
+        console.log(`  ${site.deployed ? "●" : "○"} ${site.url}  ${visibility} · ${fmtBytes(site.total_bytes)} · ${site.updated_at} UTC`);
+    }
+    console.log("");
+}
+async function selectDeployment(args) {
     const parsed = parseDeployArgs(args);
     let { name, dirArg, visibility } = parsed;
     const dir = resolveSiteDir(dirArg);
     const files = collectFiles(dir);
-    if (!files.some((f) => f.path === "index.html")) {
+    if (!files.some((file) => file.path === "index.html")) {
         throw new Error(`${dir} 里没有 index.html,网站需要一个首页`);
     }
-    const totalBytes = files.reduce((s, f) => s + f.bytes, 0);
+    const totalBytes = files.reduce((sum, file) => sum + file.bytes, 0);
     console.log("");
     console.log(`  部署目录  ${dir}`);
     console.log(`  文件      ${files.length} 个,共 ${fmtBytes(totalBytes)}`);
@@ -252,55 +247,61 @@ export async function deployCommand(cfg, args) {
     // 取更安全的 private，用户仍可用 --public 明确公开。
     if (!visibility && remembered !== name)
         visibility = await promptVisibility();
-    let start;
-    for (let attempt = 0; !start; attempt++) {
+    return { dir, files, name, totalBytes, visibility };
+}
+async function startDeployment(cfg, initialName) {
+    let name = initialName;
+    for (let attempt = 0;; attempt++) {
         try {
-            start = await api(cfg, "POST", "/deploy/start", { site: name });
+            const start = await api(cfg, {
+                method: "POST",
+                path: "/deploy/start",
+                body: { site: name },
+            });
+            return { name, start };
         }
-        catch (e) {
-            const code = e.code;
+        catch (error) {
+            const code = error.code;
             const retriable = code === "site_name_taken" || code === "invalid_site_name";
             if (!retriable || attempt >= 3)
-                throw e;
-            console.log(`  ${e.message}`);
+                throw error;
+            console.log(`  ${error.message}`);
+            const suggested = `${name.slice(0, 25)}-${Math.random().toString(36).slice(2, 6)}`;
             if (!process.stdin.isTTY) {
                 // 非交互环境自动加后缀重试一次
                 if (attempt > 0)
-                    throw e;
-                name = `${name.slice(0, 25)}-${Math.random().toString(36).slice(2, 6)}`;
+                    throw error;
+                name = suggested;
             }
             else {
-                name = await promptSiteName(`${name.slice(0, 25)}-${Math.random().toString(36).slice(2, 6)}`);
+                name = await promptSiteName(suggested);
             }
         }
     }
-    const tooBig = files.filter((f) => f.bytes > start.limits.max_file_bytes);
+}
+function validateDeploymentLimits(start, files, totalBytes) {
+    const tooBig = files.filter((file) => file.bytes > start.limits.max_file_bytes);
     if (tooBig.length) {
         throw new Error(`这些文件超过单文件上限 ${fmtBytes(start.limits.max_file_bytes)}:\n` +
-            tooBig.map((f) => `    ${f.path}(${fmtBytes(f.bytes)})`).join("\n"));
+            tooBig.map((file) => `    ${file.path}(${fmtBytes(file.bytes)})`).join("\n"));
     }
     if (files.length > start.limits.max_files || totalBytes > start.limits.max_total_bytes) {
         throw new Error(`超出配额:最多 ${start.limits.max_files} 个文件 / ${fmtBytes(start.limits.max_total_bytes)}。` +
             `当前 ${files.length} 个 / ${fmtBytes(totalBytes)}`);
     }
-    await uploadAll(cfg, start, files);
-    const fin = await api(cfg, "POST", "/deploy/finish", {
-        site: start.site,
-        deploy_id: start.deploy_id,
-        visibility,
-    });
-    rememberSite(dir, start.slug || name || start.site);
-    console.log(`  ✅ 部署完成,${fin.file_count} 个文件已上线`);
+}
+function printDeploymentResult(result, start) {
+    console.log(`  ✅ 部署完成,${result.file_count} 个文件已上线`);
     console.log("");
-    console.log(`  ${fin.visibility === "private" ? "🔒" : "🌐"} ${fin.url}`);
+    console.log(`  ${result.visibility === "private" ? "🔒" : "🌐"} ${result.url}`);
     console.log("");
-    if ((fin.hostname || start.hostname || "").split(".").length > 3) {
+    if ((result.hostname || start.hostname || "").split(".").length > 3) {
         console.log("  新 hostname 的 HTTPS 证书会由 Total TLS 自动签发，首次访问可能需要等待几分钟。");
     }
-    if (fin.visibility === "private") {
+    if (result.visibility === "private") {
         console.log("  私密站点仅你可见,请从 https://u1s1.io/dashboard#sec-sites 打开。");
     }
-    else if (fin.community_listed) {
+    else if (result.community_listed) {
         console.log("  已进入 https://u1s1.io/community ,把网址发给朋友就能看。");
     }
     else {
@@ -309,3 +310,25 @@ export async function deployCommand(cfg, args) {
     console.log("  改完代码再跑一次 u1s1 deploy 即可更新。");
     console.log("");
 }
+export async function deployCommand(cfg, args) {
+    // 参数:[dir] [--name xxx] [--public|--private];u1s1 deploy list 列出已有站点
+    if (args[0] === "list") {
+        await listDeployments(cfg);
+        return;
+    }
+    const selection = await selectDeployment(args);
+    const { name, start } = await startDeployment(cfg, selection.name);
+    validateDeploymentLimits(start, selection.files, selection.totalBytes);
+    await uploadAll(cfg, start, selection.files);
+    const result = await api(cfg, {
+        method: "POST",
+        path: "/deploy/finish",
+        body: {
+            site: start.site,
+            deploy_id: start.deploy_id,
+            visibility: selection.visibility,
+        },
+    });
+    rememberSite(selection.dir, start.slug || name || start.site);
+    printDeploymentResult(result, start);
+}

package/dist/import/claude.d.ts

@@ -1,3 +1,4 @@
-import type { SourceAdapter, SourceSession } from "./types.js";
+import type { ConvertedSession, SourceAdapter, SourceSession } from "./types.js";
 export declare function hydrateClaudeSession(session: SourceSession): Promise<SourceSession>;
+export declare function convertClaudeSession(session: SourceSession): ConvertedSession;
 export declare const claudeAdapter: SourceAdapter;

package/dist/import/claude.js

@@ -12,6 +12,7 @@ const CLAUDE_TOOL_MAP = {
     grep: "grep",
     ls: "ls",
 };
+const MAX_CLAUDE_LINE_CHARS = 8_000_000;
 function claudeHomes() {
     return uniqueExistingDirs([
         process.env["CLAUDE_CONFIG_DIR"],
@@ -152,14 +153,25 @@ function firstUserPreview(obj) {
         return undefined;
     return oneLine(firstMeaningfulLine(text) || text);
 }
+function updateClaudeHydration(state, obj) {
+    state.sourceId ||= asString(obj["sessionId"]) ?? "";
+    state.cwd ||= extractCwd(obj) ?? "";
+    state.title ??= extractTitle(obj);
+    state.startedAt ??= parseTime(obj["timestamp"]);
+    state.preview ??= firstUserPreview(obj);
+}
+function hasClaudeHydrationIdentity(state) {
+    return Boolean(state.cwd && (state.title || state.preview) && state.sourceId);
+}
 export async function hydrateClaudeSession(session) {
     const stream = createReadStream(session.sourcePath, { encoding: "utf8" });
     const rl = createInterface({ input: stream, crlfDelay: Infinity });
-    let cwd = "";
-    let title = session.title;
-    let sourceId = session.sourceId;
-    let startedAt = session.startedAt;
-    let preview;
+    const state = {
+        cwd: "",
+        title: session.title,
+        sourceId: session.sourceId,
+        startedAt: session.startedAt,
+    };
     let lines = 0;
     try {
         for await (const line of rl) {
@@ -167,17 +179,8 @@ export async function hydrateClaudeSession(session) {
             const obj = parseJsonLine(line);
             if (!obj)
                 continue;
-            if (!sourceId)
-                sourceId = asString(obj["sessionId"]) ?? sourceId;
-            if (!cwd)
-                cwd = extractCwd(obj) ?? "";
-            if (!title)
-                title = extractTitle(obj) ?? title;
-            if (!startedAt)
-                startedAt = parseTime(obj["timestamp"]);
-            if (!preview)
-                preview = firstUserPreview(obj);
-            if (cwd && (title || preview) && sourceId && lines > 80)
+            updateClaudeHydration(state, obj);
+            if (hasClaudeHydrationIdentity(state) && lines > 80)
                 break;
             if (lines > 400)
                 break;
@@ -189,10 +192,148 @@ export async function hydrateClaudeSession(session) {
     }
     return {
         ...session,
-        sourceId: sourceId || session.sourceId,
-        cwd: cwd || session.cwd,
-        title: title || preview || session.title,
-        startedAt: startedAt ?? session.startedAt,
+        sourceId: state.sourceId || session.sourceId,
+        cwd: state.cwd || session.cwd,
+        title: state.title || state.preview || session.title,
+        startedAt: state.startedAt ?? session.startedAt,
+    };
+}
+function readClaudeTranscript(path) {
+    try {
+        return readFileSync(path, "utf8");
+    }
+    catch {
+        return undefined;
+    }
+}
+function appendClaudeToolResults(state, blocks, timestamp) {
+    for (const raw of blocks) {
+        const block = asRecord(raw);
+        if (!block || block["type"] !== "tool_result")
+            continue;
+        const callId = asString(block["tool_use_id"]);
+        if (!callId)
+            continue;
+        state.messages.push({
+            role: "toolResult",
+            toolCallId: callId,
+            toolName: state.pendingTools.get(callId) ?? "unknown",
+            text: truncateText(flattenToolResult(block["content"]), MAX_TOOL_RESULT_CHARS),
+            isError: block["is_error"] === true,
+            timestamp,
+        });
+    }
+}
+function appendClaudeUser(state, obj) {
+    const message = asRecord(obj["message"]);
+    if (!message)
+        return;
+    const rawContent = message["content"];
+    const timestamp = parseTime(obj["timestamp"]) ?? Date.now();
+    if (isToolResultContent(rawContent) && Array.isArray(rawContent)) {
+        appendClaudeToolResults(state, rawContent, timestamp);
+        return;
+    }
+    const text = truncateText(flattenClaudeContent(rawContent), MAX_TEXT_CHARS).trim();
+    if (!text)
+        return;
+    state.title ||= oneLine(firstMeaningfulLine(text) || text);
+    state.messages.push({ role: "user", text, timestamp });
+}
+function convertClaudeContentBlock(raw, pendingTools) {
+    const block = asRecord(raw);
+    if (!block)
+        return undefined;
+    const blockType = asString(block["type"]);
+    if (blockType === "thinking") {
+        const thinking = asString(block["thinking"]) ?? "";
+        return thinking.trim()
+            ? { type: "thinking", thinking: truncateText(thinking, MAX_TEXT_CHARS) }
+            : undefined;
+    }
+    if (blockType === "text") {
+        const text = asString(block["text"]) ?? "";
+        return text.trim() ? { type: "text", text: truncateText(text, MAX_TEXT_CHARS) } : undefined;
+    }
+    if (blockType !== "tool_use")
+        return undefined;
+    const id = asString(block["id"]);
+    if (!id)
+        return undefined;
+    const name = asString(block["name"]) ?? "unknown";
+    const mappedName = mapToolName(name);
+    pendingTools.set(id, mappedName);
+    return {
+        type: "toolCall",
+        id,
+        name: mappedName,
+        arguments: remapToolArgs(name, asRecord(block["input"]) ?? {}),
+    };
+}
+function claudeStopReason(content, rawStopReason) {
+    if (content.some((block) => block.type === "toolCall") || rawStopReason === "tool_use") {
+        return "toolUse";
+    }
+    return rawStopReason === "max_tokens" ? "length" : "stop";
+}
+function appendClaudeAssistant(state, obj) {
+    const message = asRecord(obj["message"]);
+    if (!message)
+        return;
+    const rawBlocks = Array.isArray(message["content"]) ? message["content"] : [];
+    const content = rawBlocks
+        .map((block) => convertClaudeContentBlock(block, state.pendingTools))
+        .filter((block) => block !== undefined);
+    if (content.length === 0)
+        return;
+    state.messages.push({
+        role: "assistant",
+        content,
+        provider: "anthropic",
+        model: asString(message["model"]) ?? "claude",
+        api: "anthropic-messages",
+        stopReason: claudeStopReason(content, message["stop_reason"]),
+        usage: usageFromClaude(message["usage"]),
+        timestamp: parseTime(obj["timestamp"]) ?? Date.now(),
+    });
+}
+function consumeClaudeEntry(state, obj) {
+    const type = asString(obj["type"]);
+    state.cwd ||= extractCwd(obj) ?? "";
+    if (!state.title && type === "ai-title") {
+        state.title = extractTitle(obj);
+    }
+    if (obj["isSidechain"] === true)
+        return;
+    if (type === "user") {
+        appendClaudeUser(state, obj);
+    }
+    else if (type === "assistant") {
+        appendClaudeAssistant(state, obj);
+    }
+}
+export function convertClaudeSession(session) {
+    const text = readClaudeTranscript(session.sourcePath);
+    if (text === undefined) {
+        return { cwd: session.cwd || process.cwd(), title: session.title, messages: [] };
+    }
+    const state = {
+        messages: [],
+        cwd: "",
+        title: session.title,
+        pendingTools: new Map(),
+    };
+    for (const line of text.split(/\r?\n/)) {
+        if (line.length > MAX_CLAUDE_LINE_CHARS)
+            continue;
+        const obj = parseJsonLine(line);
+        if (obj)
+            consumeClaudeEntry(state, obj);
+    }
+    return {
+        cwd: state.cwd || session.cwd || process.cwd(),
+        title: state.title,
+        messages: state.messages,
     };
 }
 export const claudeAdapter = {
@@ -259,114 +400,6 @@ export const claudeAdapter = {
         return found;
     },
     convert(session) {
-        let text = "";
-        try {
-            // Large Claude transcripts can be tens of MB; still fine as a one-shot import.
-            text = readFileSync(session.sourcePath, "utf8");
-        }
-        catch {
-            return { cwd: session.cwd || process.cwd(), title: session.title, messages: [] };
-        }
-        const messages = [];
-        let cwd = "";
-        let title = session.title;
-        const pendingTools = new Map();
-        for (const line of text.split(/\r?\n/)) {
-            if (line.length > 8_000_000)
-                continue;
-            const obj = parseJsonLine(line);
-            if (!obj)
-                continue;
-            const type = asString(obj["type"]);
-            if (!cwd)
-                cwd = extractCwd(obj) ?? cwd;
-            if (!title && type === "ai-title")
-                title = extractTitle(obj) ?? title;
-            if (obj["isSidechain"] === true)
-                continue;
-            if (type === "user") {
-                const msg = asRecord(obj["message"]);
-                if (!msg)
-                    continue;
-                const content = msg["content"];
-                const ts = parseTime(obj["timestamp"]) ?? Date.now();
-                if (isToolResultContent(content) && Array.isArray(content)) {
-                    for (const raw of content) {
-                        const block = asRecord(raw);
-                        if (!block || block["type"] !== "tool_result")
-                            continue;
-                        const callId = asString(block["tool_use_id"]) ?? "";
-                        if (!callId)
-                            continue;
-                        messages.push({
-                            role: "toolResult",
-                            toolCallId: callId,
-                            toolName: pendingTools.get(callId) ?? "unknown",
-                            text: truncateText(flattenToolResult(block["content"]), MAX_TOOL_RESULT_CHARS),
-                            isError: block["is_error"] === true,
-                            timestamp: ts,
-                        });
-                    }
-                    continue;
-                }
-                const userText = truncateText(flattenClaudeContent(content), MAX_TEXT_CHARS).trim();
-                if (!userText)
-                    continue;
-                if (!title)
-                    title = oneLine(firstMeaningfulLine(userText) || userText);
-                messages.push({ role: "user", text: userText, timestamp: ts });
-                continue;
-            }
-            if (type !== "assistant")
-                continue;
-            const msg = asRecord(obj["message"]);
-            if (!msg)
-                continue;
-            const ts = parseTime(obj["timestamp"]) ?? Date.now();
-            const blocks = Array.isArray(msg["content"]) ? msg["content"] : [];
-            const content = [];
-            let sawTool = false;
-            for (const raw of blocks) {
-                const block = asRecord(raw);
-                if (!block)
-                    continue;
-                const btype = asString(block["type"]);
-                if (btype === "thinking") {
-                    const thinking = asString(block["thinking"]) ?? "";
-                    if (thinking.trim())
-                        content.push({ type: "thinking", thinking: truncateText(thinking, MAX_TEXT_CHARS) });
-                }
-                else if (btype === "text") {
-                    const textBlock = asString(block["text"]) ?? "";
-                    if (textBlock.trim())
-                        content.push({ type: "text", text: truncateText(textBlock, MAX_TEXT_CHARS) });
-                }
-                else if (btype === "tool_use") {
-                    const id = asString(block["id"]) ?? "";
-                    const name = asString(block["name"]) ?? "unknown";
-                    if (!id)
-                        continue;
-                    const input = asRecord(block["input"]) ?? {};
-                    const mapped = mapToolName(name);
-                    pendingTools.set(id, mapped);
-                    content.push({ type: "toolCall", id, name: mapped, arguments: remapToolArgs(name, input) });
-                    sawTool = true;
-                }
-            }
-            if (content.length === 0)
-                continue;
-            const stop = asString(msg["stop_reason"]);
-            messages.push({
-                role: "assistant",
-                content,
-                provider: "anthropic",
-                model: asString(msg["model"]) ?? "claude",
-                api: "anthropic-messages",
-                stopReason: sawTool || stop === "tool_use" ? "toolUse" : stop === "max_tokens" ? "length" : "stop",
-                usage: usageFromClaude(msg["usage"]),
-                timestamp: ts,
-            });
-        }
-        return { cwd: cwd || session.cwd || process.cwd(), title, messages };
+        return convertClaudeSession(session);
     },
 };

package/dist/import/codex.d.ts

@@ -1,3 +1,4 @@
-import type { SourceAdapter, SourceSession } from "./types.js";
+import type { ConvertedSession, SourceAdapter, SourceSession } from "./types.js";
 export declare function hydrateCodexSession(session: SourceSession): Promise<SourceSession>;
+export declare function convertCodexSession(session: SourceSession): ConvertedSession;
 export declare const codexAdapter: SourceAdapter;