neoctl 0.2.13 → 0.2.15

package/dist/web/index.js

@@ -2,7 +2,7 @@
 import http from "node:http";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { existsSync, readFileSync } from "node:fs";
+import { createReadStream, existsSync, readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
 import { QueryEngine } from "../core/query-engine.js";
@@ -28,9 +28,14 @@ import { createTaskTools } from "../tasks/task-tools.js";
 import { TaskStore } from "../tasks/task-store.js";
 import { parseReplCommand, helpText, replCommandDefinitions } from "../repl/commands.js";
 import { writeSessionMarkdownExport } from "../session/session-export.js";
+import { DefaultContextManager } from "../context/context-manager.js";
+import { buildEffectiveSystemPrompt } from "../context/prompts.js";
 import { WEB_HTML } from "./html.js";
 import { openDirectory } from "../open-directory.js";
-import { resolveImageBlockDataSync } from "../core/image-storage.js";
+import { getNeoctlHome } from "../paths.js";
+import { FileSystemSkillCatalog } from "../skills/skill-filesystem.js";
+import { createSkillTool } from "../skills/skill-tool.js";
+import { createSkillManagementTools } from "../skills/skill-management-tools.js";
 const require = createRequire(import.meta.url);
 const markedPackageDir = path.dirname(require.resolve("marked/package.json"));
 const highlightPackageDir = path.dirname(require.resolve("@highlightjs/cdn-assets/package.json"));
@@ -82,9 +87,9 @@ function sumUsageTokens(left, right) {
     return (left ?? 0) + (right ?? 0);
 }
 const DEFAULT_WEB_RUNTIME_KEY = "__default__";
-export async function runWebServer(argv = process.argv.slice(2)) {
+export async function runWebServer(argv = process.argv.slice(2), runtimeOptions = {}) {
     const options = parseWebArgs(argv);
-    const router = await createWebRuntimeRouter();
+    const router = await createWebRuntimeRouter(runtimeOptions);
     const server = http.createServer((req, res) => void route(req, res, router));
     await new Promise((resolve) => server.listen(options.port, options.host, resolve));
     const address = server.address();
@@ -109,13 +114,98 @@ function parseWebArgs(argv) {
         port = 3000;
     return { host, port: Math.round(port) };
 }
+class SkillCatalogContextManager {
+    catalog;
+    base;
+    constructor(catalog, base = new DefaultContextManager()) {
+        this.catalog = catalog;
+        this.base = base;
+    }
+    async build(input) {
+        const runtimeContext = await this.base.build(input);
+        const skillSection = await buildSkillCatalogPromptSection(this.catalog);
+        if (!skillSection)
+            return runtimeContext;
+        const promptSections = [...runtimeContext.promptSections, skillSection];
+        return {
+            ...runtimeContext,
+            promptSections,
+            systemPrompt: buildEffectiveSystemPrompt(promptSections, input),
+        };
+    }
+}
+async function buildSkillCatalogPromptSection(catalog) {
+    const skills = await catalog.list();
+    if (skills.length === 0)
+        return undefined;
+    const visible = skills.slice(0, 80);
+    const lines = visible.map((skill) => {
+        const tags = skill.tags?.length ? `; tags=${skill.tags.join(",")}` : "";
+        const tools = skill.allowedTools?.length ? `; allowedTools=${skill.allowedTools.join(",")}` : "";
+        return `- ${skill.name}: ${skill.description} (execution=${skill.execution}${tags}${tools})`;
+    });
+    if (skills.length > visible.length)
+        lines.push(`- ... ${skills.length - visible.length} more skills available; use skill_list for the full catalog.`);
+    return {
+        name: "Available Skills",
+        cacheStable: false,
+        content: [
+            "Reusable skills are available through the `skill` tool and the /skill UI command.",
+            "When the user's task matches a skill name, description, tags, or domain capability, proactively call the `skill` tool before doing the work directly.",
+            "Do not wait for the user to explicitly say 'use skill'. Use skill_list/skill_read if you need to inspect details.",
+            "Available skill catalog:",
+            ...lines,
+        ].join("\n"),
+    };
+}
+function resolveSkillCatalogRoots(cwd, extraRoots = [], createRoot) {
+    const userRoot = path.resolve(process.env.NEO_SKILL_CREATE_ROOT || createRoot || path.join(getNeoctlHome(), "skills"));
+    const configuredRoots = splitPathList(process.env.NEO_SKILL_ROOTS);
+    const workspaceRoot = path.resolve(cwd, ".neo", "skills");
+    const roots = uniquePaths([
+        userRoot,
+        ...extraRoots,
+        ...configuredRoots,
+        workspaceRoot,
+    ]).map((root) => ({
+        root,
+        kind: path.resolve(root) === userRoot ? "user" : "workspace",
+    }));
+    return { roots, createRoot: userRoot };
+}
+function splitPathList(value) {
+    return String(value || "")
+        .split(path.delimiter)
+        .map((item) => item.trim())
+        .filter(Boolean)
+        .map((item) => path.resolve(item));
+}
+function uniquePaths(values) {
+    const seen = new Set();
+    const result = [];
+    for (const value of values) {
+        const resolved = path.resolve(value);
+        const key = process.platform === "win32" ? resolved.toLowerCase() : resolved;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        result.push(resolved);
+    }
+    return result;
+}
 export async function createWebRuntime(options = {}) {
     const envLoad = loadDefaultDotEnvFiles({ override: true });
+    const cwd = options.cwd ? path.resolve(options.cwd) : process.cwd();
     const modelConfig = readModelProviderConfig(process.env);
     const communicationLogger = new CommunicationLogger();
     const modelGateway = new LoggingModelGateway(createModelGatewayFromProcessEnv(process.env), communicationLogger);
     const taskStore = new TaskStore();
     const tools = new ToolRegistry();
+    const { roots: skillRoots, createRoot: skillCreateRoot } = resolveSkillCatalogRoots(cwd, options.skillRoots, options.skillCreateRoot);
+    const skills = new FileSystemSkillCatalog({
+        roots: skillRoots,
+        createRoot: skillCreateRoot,
+    });
     tools.register(editTool);
     tools.register(writeTool);
     tools.register(createExecTool({ taskStore }));
@@ -128,13 +218,18 @@ export async function createWebRuntime(options = {}) {
     if (modelConfig?.provider === "openai")
         tools.register(createOpenAIImageGenerationTool());
     tools.register(planTool);
+    tools.register(createSkillTool(skills));
+    for (const tool of createSkillManagementTools(skills, { requireApproval: true, allowDelete: false }))
+        tools.register(tool);
+    for (const tool of options.externalTools ?? [])
+        tools.register(tool);
     const agentRuntime = { modelGateway, tools, taskStore };
     tools.register(createAgentTool(agentRuntime));
     const resumeHandler = async (taskId, directive) => {
         const dummyContext = {
             agentId: "main",
             tools,
-            appState: new InMemoryAppState("main"),
+            appState: new InMemoryAppState("main", cwd),
             emit: () => undefined,
         };
         return resumeAgentTask(taskId, directive, agentRuntime, taskStore, dummyContext);
@@ -144,6 +239,7 @@ export async function createWebRuntime(options = {}) {
     const appPromptStore = new InMemoryAppPromptStore();
     const engine = new QueryEngine({
         agentId: options.agentId ?? "main",
+        cwd,
         model: modelConfig?.model,
         fallbackModel: modelConfig?.fallbackModel,
         reasoning: modelConfig?.defaultReasoning,
@@ -151,6 +247,8 @@ export async function createWebRuntime(options = {}) {
         modelGateway,
         tools,
         appPromptStore,
+        contextManager: new SkillCatalogContextManager(skills),
+        skills: (await skills.list()).map((skill) => skill.name),
         taskNotificationSource: createTaskNotificationSource(taskStore),
         commands: replCommandDefinitions.map((command) => command.usage),
         session: {
@@ -504,7 +602,7 @@ export class WebRepl {
         this.broadcastSync();
     }
     setStatus(next) {
-        this.status = next;
+        this.status = next.phase === "running_tools" ? next : { ...next, currentTool: undefined };
         this.broadcastSync();
     }
     finalizeForegroundView() {
@@ -674,10 +772,13 @@ export class WebRepl {
         if (event.type === "tool.started") {
             this.finalizeLiveLine(this.assistantLineId);
             this.finalizeThinkingLine();
+            this.broadcastSync();
             return;
         }
-        if (event.type === "tool.finished")
+        if (event.type === "tool.finished") {
+            this.broadcastSync();
             return;
+        }
         if (event.type === "terminal") {
             this.finalizeLiveLine(this.assistantLineId);
             this.finalizeThinkingLine();
@@ -785,6 +886,8 @@ export class WebRepl {
         }
         const promptPayload = buildWebPromptPayload(command.text, attachments);
         this.append({ kind: "user", text: promptPayload.displayText });
+        for (const line of imageLinesForBlocks("user", promptPayload.blocks))
+            this.append(line);
         const runToken = ++this.foregroundRunToken;
         const abortController = new AbortController();
         this.activeAbortController = abortController;
@@ -876,10 +979,14 @@ export class WebRepl {
         res.write(`event: ${event}\n`);
         res.write(`data: ${JSON.stringify(data)}\n\n`);
     }
+    sendSerialized(res, event, data) {
+        res.write(`event: ${event}\n`);
+        res.write(`data: ${data}\n\n`);
+    }
     broadcastSync() {
-        const payload = this.snapshot(false);
+        const payload = JSON.stringify(this.snapshot(false));
         for (const res of this.subscribers)
-            this.send(res, "sync", payload);
+            this.sendSerialized(res, "sync", payload);
     }
 }
 function reqKeepAlive(res) {
@@ -898,6 +1005,8 @@ async function route(req, res, router) {
             return sendFile(res, highlightAssetPath, "text/javascript; charset=utf-8");
         if (req.method === "GET" && url.pathname === "/vendor/highlight-theme.css")
             return sendFile(res, highlightThemeAssetPath, "text/css; charset=utf-8");
+        if (req.method === "GET" && url.pathname === "/api/images")
+            return sendImage(res, url.searchParams.get("path"), url.searchParams.get("mime"));
         const scope = webRuntimeScopeFromUrl(url);
         const repl = await router.get(scope);
         if (req.method === "GET" && url.pathname === "/events")
@@ -961,6 +1070,23 @@ async function sendFile(res, filepath, contentType) {
     res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "public, max-age=3600" });
     res.end(body);
 }
+async function sendImage(res, encodedPath, mimeType) {
+    const filepath = decodeImagePath(encodedPath);
+    if (!filepath)
+        return sendJson(res, { error: "missing image path" }, 400);
+    const contentType = safeImageContentType(mimeType);
+    const binaryPath = filepath.endsWith(".base64.txt") ? filepath.slice(0, -".base64.txt".length) : filepath;
+    if (existsSync(binaryPath)) {
+        res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "no-store" });
+        createReadStream(binaryPath).pipe(res);
+        return;
+    }
+    if (!existsSync(filepath))
+        return sendJson(res, { error: "image not found" }, 404);
+    const base64 = (await fs.readFile(filepath, "utf8")).trim();
+    res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "no-store" });
+    res.end(Buffer.from(stripDataUrlPrefix(base64), "base64"));
+}
 function sendJson(res, value, status = 200) {
     res.writeHead(status, { "Content-Type": "application/json; charset=utf-8", "Cache-Control": "no-store" });
     res.end(JSON.stringify(value));
@@ -1063,7 +1189,11 @@ function pushTextBlock(blocks, text) {
 }
 function reduceStatus(status, event) {
     if (event.type === "state")
-        return { ...status, phase: event.phase, detail: event.detail, usage: event.phase === "preparing" ? undefined : status.usage, streamedOutputTokens: event.phase === "preparing" ? 0 : status.streamedOutputTokens, inputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.outputTokenUpdatedAt, retryCooldownUntil: event.phase === "preparing" ? undefined : status.retryCooldownUntil, activityTick: status.activityTick + 1 };
+        return { ...status, phase: event.phase, detail: event.detail, currentTool: event.phase === "preparing" || event.phase === "calling_model" || event.phase === "ready" ? undefined : status.currentTool, usage: event.phase === "preparing" ? undefined : status.usage, streamedOutputTokens: event.phase === "preparing" ? 0 : status.streamedOutputTokens, inputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.outputTokenUpdatedAt, retryCooldownUntil: event.phase === "preparing" ? undefined : status.retryCooldownUntil, activityTick: status.activityTick + 1 };
+    if (event.type === "tool.started")
+        return { ...status, phase: "running_tools", detail: event.toolUse.name, currentTool: { id: event.toolUse.id, name: event.toolUse.name, kind: toolKindForToolUse(event.toolUse.name, event.toolUse.input), startedAt: Date.now() }, activityTick: status.activityTick + 1 };
+    if (event.type === "tool.finished")
+        return { ...status, currentTool: status.currentTool?.id === event.toolUse.id ? undefined : status.currentTool, activityTick: status.activityTick + 1 };
     if (event.type === "context.metrics")
         return { ...status, metrics: event.metrics, inputTokenUpdatedAt: event.metrics.estimatedInputTokens !== status.metrics?.estimatedInputTokens ? Date.now() : status.inputTokenUpdatedAt, activityTick: status.activityTick + 1 };
     if (event.type === "usage")
@@ -1077,11 +1207,26 @@ function reduceStatus(status, event) {
     if (event.type === "retrying")
         return { ...status, phase: "calling_model", detail: `retrying in ${(event.delayMs / 1000).toFixed(1)}s`, retryCooldownUntil: Date.now() + event.delayMs, activityTick: status.activityTick + 1 };
     if (event.type === "terminal")
-        return { ...status, phase: "stopped", detail: event.reason, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined, activityTick: status.activityTick + 1 };
-    if (event.type === "message" || event.type === "tool.started" || event.type === "tool.finished" || event.type === "error")
+        return { ...status, phase: "stopped", detail: event.reason, currentTool: undefined, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined, activityTick: status.activityTick + 1 };
+    if (event.type === "message" || event.type === "error")
         return { ...status, activityTick: status.activityTick + 1 };
     return status;
 }
+function toolKindForToolUse(toolName, input) {
+    if (toolName === "image2")
+        return isRecord(input) && input.mode === "edit" ? "修图" : "作图";
+    if (toolName === "edit" || toolName === "write" || toolName.includes("artifact_editor") || toolName.includes("apply_patch"))
+        return "编辑";
+    if (toolName === "exec" || toolName.includes("shell") || toolName.includes("command"))
+        return "执行";
+    if (toolName.includes("download"))
+        return "下载";
+    if (toolName === "read" || toolName === "list" || toolName === "grep" || toolName === "search" || toolName.includes("query") || toolName.includes("load"))
+        return "查询";
+    if (toolName === "plan")
+        return "计划";
+    return "工具";
+}
 async function handleExportCommand(outputPath, runtime) {
     const snapshot = runtime.engine.snapshot();
     if (!snapshot.session)
@@ -1466,6 +1611,14 @@ function renderMessageImages(message, append) {
     }
     return rendered;
 }
+function imageLinesForBlocks(role, blocks) {
+    if (!blocks?.length)
+        return [];
+    return blocks
+        .filter((block) => block.type === "image")
+        .map((block) => imageLineForBlock(role, block))
+        .filter((line) => Boolean(line));
+}
 function imageLineForBlock(role, block) {
     const kind = kindForRole(role);
     if (kind === "meta")
@@ -1474,20 +1627,43 @@ function imageLineForBlock(role, block) {
         kind,
         text: block.label ?? `[image ${block.mimeType}]`,
         image: {
-            src: imageBlockToDataUrl(block),
+            src: imageBlockToSrc(block),
             label: block.label,
             mimeType: block.mimeType,
         },
     };
 }
-function imageBlockToDataUrl(block) {
-    const data = resolveImageBlockDataSync(block);
+function imageBlockToSrc(block) {
+    if (block.storage?.path) {
+        return `/api/images?path=${encodeImagePath(block.storage.path)}&mime=${encodeURIComponent(block.mimeType)}`;
+    }
+    const data = block.data.trim();
     if (!data)
         return "";
     if (data.startsWith("data:"))
         return data;
     return `data:${block.mimeType};base64,${data}`;
 }
+function encodeImagePath(filepath) {
+    return Buffer.from(filepath, "utf8").toString("base64url");
+}
+function decodeImagePath(value) {
+    if (!value)
+        return undefined;
+    try {
+        return Buffer.from(value, "base64url").toString("utf8");
+    }
+    catch {
+        return undefined;
+    }
+}
+function safeImageContentType(value) {
+    return value && /^image\/[a-z0-9.+-]+$/i.test(value) ? value : "application/octet-stream";
+}
+function stripDataUrlPrefix(value) {
+    const match = /^data:[^;]+;base64,(.*)$/is.exec(value);
+    return match ? match[1] : value;
+}
 function assistantText(message) {
     const text = message.blocks.filter((block) => block.type === "text").map((block) => block.text).join("");
     return text.length > 0 ? text : undefined;
@@ -1540,14 +1716,21 @@ function thinkingLine(text, live = false) {
     return { kind: "thinking", title: titleForKind("thinking"), text, previewStyle: "summary", summaryMaxLines: THINKING_SUMMARY_MAX_LINES, live };
 }
 function formatToolUse(toolUse) {
+    const toolKind = toolKindForToolUse(toolUse.name, toolUse.input);
     if (toolUse.name === "plan" && isPlanToolPayload(toolUse.input))
-        return { kind: "tool", title: toolTitle(toolUse.name, "running"), bodyTitle: planToolBodyTitle(toolUse.input), text: formatPlanToolPayload(toolUse.input), collapsible: true };
+        return { kind: "tool", title: toolTitle(toolUse.name, "running"), bodyTitle: planToolBodyTitle(toolUse.input), toolKind, text: formatPlanToolPayload(toolUse.input), collapsible: true };
     const description = toolUse.name === "exec" ? execDescriptionFromInput(toolUse.input) : undefined;
-    return { kind: "tool", title: toolTitle(toolUse.name, "running"), bodyTitle: description, text: formatReplData(toolUse.input, 1200), previewStyle: "summary", collapsible: true };
+    return { kind: "tool", title: toolTitle(toolUse.name, "running"), bodyTitle: description, toolKind, text: formatReplData(toolUse.input, 1200), previewStyle: "summary", collapsible: true };
 }
 function formatToolResultLine(toolName, output, ok) {
     const formatted = formatToolResult(toolName, output, ok);
-    return { kind: ok ? "tool" : "error", title: toolTitle(toolName, "finished"), bodyTitle: formatted.bodyTitle, titleStatus: ok ? "success" : "failure", text: formatted.text, format: formatted.format, live: false, previewStyle: formatted.full ? undefined : "summary", summaryMaxLines: formatted.summaryMaxLines, collapsible: true };
+    return { kind: ok ? "tool" : "error", title: toolTitle(toolName, "finished"), bodyTitle: formatted.bodyTitle, titleStatus: ok ? "success" : "failure", toolKind: toolKindForToolUse(toolName, undefined), text: formatted.text, format: formatted.format, live: false, previewStyle: formatted.full ? undefined : "summary", summaryMaxLines: formatted.summaryMaxLines, collapsible: true, artifact: xhsArtifactFromToolOutput(toolName, output) };
+}
+function xhsArtifactFromToolOutput(toolName, output) {
+    if (toolName !== "open_xhs_artifact_editor" || !isRecord(output))
+        return undefined;
+    const artifact = output.artifact;
+    return isRecord(artifact) && typeof artifact.id === "string" ? artifact : undefined;
 }
 function toolTitle(toolName, _phase) {
     return toolName;
@@ -1649,17 +1832,17 @@ function isExecOutput(value) {
     return isRecord(value) && typeof value.command === "string" && typeof value.durationMs === "number";
 }
 function formatExecToolResult(output, ok) {
-    const status = output.timedOut ? "timed out" : output.exitCode === 0 ? "exit 0" : `exit ${output.exitCode ?? output.signal ?? "unknown"}`;
+    const status = output.timedOut ? "已超时" : ok ? "已完成" : "执行失败";
     const description = typeof output.description === "string" ? output.description.trim() : "";
-    const lines = ["exec result", ...(description ? [`purpose: ${description}`] : []), `status: ${status}`, `duration: ${output.durationMs}ms`, `command: ${output.command}`];
+    const lines = [description ? `目的：${description}` : "执行命令", `状态：${status}`, `耗时：${output.durationMs}ms`];
     const stdout = typeof output.stdout === "string" ? output.stdout.replace(/\s+$/u, "") : "";
     const stderr = typeof output.stderr === "string" ? output.stderr.replace(/\s+$/u, "") : "";
     if (stdout)
-        lines.push("stdout:", stdout);
+        lines.push("输出：", stdout);
     if (stderr)
-        lines.push("stderr:", stderr);
+        lines.push("错误：", stderr);
     if (!stdout && !stderr)
-        lines.push(ok ? "output: (none)" : "output: (not captured)");
+        lines.push(ok ? "无输出。" : "没有捕获到输出。");
     return lines.join("\n");
 }
 function formatImageGenerationToolResult(output, ok) {