neoctl 0.2.13 → 0.2.15

package/dist/repl/index.js

@@ -231,6 +231,40 @@ function createTaskNotificationSource(taskStore) {
         },
     };
 }
+function resolveSkillCatalogRoots(cwd) {
+    const userRoot = path.resolve(process.env.NEO_SKILL_CREATE_ROOT || path.join(getNeoctlHome(), "skills"));
+    const configuredRoots = splitPathList(process.env.NEO_SKILL_ROOTS);
+    const workspaceRoot = path.resolve(cwd, ".neo", "skills");
+    const roots = uniquePaths([
+        userRoot,
+        ...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;
+}
 async function createRuntime() {
     const envLoad = loadDefaultDotEnvFiles({ override: true });
     const modelConfig = readModelProviderConfig(process.env);
@@ -242,12 +276,9 @@ async function createRuntime() {
     const secretStore = await SecretStore.open();
     const secretRedactions = new InMemorySecretRedactionRegistry();
     const tools = new ToolRegistry();
-    const skillWorkspaceRoot = path.resolve(process.cwd(), ".neo", "skills");
+    const { roots: skillRoots, createRoot: skillWorkspaceRoot } = resolveSkillCatalogRoots(process.cwd());
     const skills = new FileSystemSkillCatalog({
-        roots: [
-            { root: skillWorkspaceRoot, kind: "workspace" },
-            { root: path.resolve(getNeoctlHome(), "skills"), kind: "user" },
-        ],
+        roots: skillRoots,
         createRoot: skillWorkspaceRoot,
     });
     tools.register(editTool);
@@ -260,7 +291,7 @@ async function createRuntime() {
     tools.register(createLoadImageTool());
     tools.register(createImageNoteTool());
     if (modelConfig?.provider === "openai")
-        tools.register(createOpenAIImageGenerationTool());
+        tools.register(createOpenAIImageGenerationTool({ taskStore, foregroundDetachRegistry: foregroundExecDetach }));
     tools.register(planTool);
     for (const tool of createSecretTools())
         tools.register(tool);
@@ -330,7 +361,7 @@ async function createRuntime() {
 function syncImageGenerationTool(runtime, provider) {
     runtime.tools.unregister("image2");
     if (provider === "openai")
-        runtime.tools.register(createOpenAIImageGenerationTool());
+        runtime.tools.register(createOpenAIImageGenerationTool({ taskStore: runtime.taskStore, foregroundDetachRegistry: runtime.foregroundExecDetach }));
 }
 function formatCreatedEnvNotice(path) {
     return `Created default config file: ${path}\nSet MODEL_PROVIDER and the matching provider section (OPENAI_API_KEY or ANTHROPIC_API_KEY), then restart neo.`;
@@ -1352,7 +1383,7 @@ function InkRepl({ runtime, initialCommandLine }) {
         if (key.ctrl && value.toLowerCase() === "b") {
             const result = runtime.foregroundExecDetach.detachCurrent();
             append(result.ok
-                ? systemLine(`Detached foreground exec to background task ${result.taskId ?? "unknown"}.`)
+                ? systemLine(`Detached foreground task to background task ${result.taskId ?? "unknown"}.`)
                 : systemLine(result.message));
             return;
         }
@@ -1656,7 +1687,7 @@ function InkRepl({ runtime, initialCommandLine }) {
             return;
         }
     });
-    return e(Box, { flexDirection: "column" }, e((Static), { items: staticLines, children: (line, index) => e(MessageBlock, { key: line.id, line, width, blockIndex: index }) }), e(MessageList, { lines: visibleDynamicLines, width, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, skillsBrowser ? e(SkillsBrowser, { state: skillsBrowser, width }) : null, secretsBrowser ? e(SecretsBrowser, { state: secretsBrowser, width }) : null, loginForm ? e(LoginFormView, { state: loginForm, width }) : null, e(StatusBar, { status, animationTick, width }), showForegroundExecDetachHint && foregroundExecDetachHandle ? e(ForegroundExecDetachHintLine, { handle: foregroundExecDetachHandle, width }) : null, agentActivities.length > 0 ? e(SubagentLivePanel, { activities: agentActivities, width, terminalRows: terminalSize.rows, compact: compactLiveLayout, animationTick }) : null, agentActivities.length === 0 && backgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: backgroundTasks, width }) : null, agentActivities.length > 0 && nonAgentBackgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: nonAgentBackgroundTasks, width }) : null, pasteStatus ? e(PasteStatusLine, { text: pasteStatus, width }) : null, queuedInput !== undefined ? e(QueuedInputLine, { text: queuedInput, width }) : null, e(PromptLine, { text: promptDisplayText, cursor: promptDisplayCursor, busy, locked: inputLockedByQueue, placeholder: input.length === 0 && promptPlaceholder !== undefined, ghostText: activePlaceholder, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }));
+    return e(Box, { flexDirection: "column" }, e((Static), { items: staticLines, children: (line, index) => e(MessageBlock, { key: line.id, line, width, blockIndex: index }) }), e(MessageList, { lines: visibleDynamicLines, width, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, skillsBrowser ? e(SkillsBrowser, { state: skillsBrowser, width }) : null, secretsBrowser ? e(SecretsBrowser, { state: secretsBrowser, width }) : null, loginForm ? e(LoginFormView, { state: loginForm, width }) : null, e(StatusBar, { status, animationTick, width }), showForegroundExecDetachHint && foregroundExecDetachHandle ? e(ForegroundExecDetachHintLine, { handle: foregroundExecDetachHandle, width }) : null, agentActivities.length > 0 ? e(SubagentLivePanel, { activities: agentActivities, width, animationTick }) : null, agentActivities.length === 0 && backgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: backgroundTasks, width }) : null, agentActivities.length > 0 && nonAgentBackgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: nonAgentBackgroundTasks, width }) : null, pasteStatus ? e(PasteStatusLine, { text: pasteStatus, width }) : null, queuedInput !== undefined ? e(QueuedInputLine, { text: queuedInput, width }) : null, e(PromptLine, { text: promptDisplayText, cursor: promptDisplayCursor, busy, locked: inputLockedByQueue, placeholder: input.length === 0 && promptPlaceholder !== undefined, ghostText: activePlaceholder, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }));
 }
 const MessageList = React.memo(function MessageList({ lines, width, lineIndexOffset = 0, onMarkdownRenderComplete }) {
     const contentWidth = messageContentWidth(width);
@@ -1994,37 +2025,26 @@ function backgroundTaskStatusRenderRows(taskCount) {
 }
 function ForegroundExecDetachHintLine({ handle, width: terminalWidth }) {
     const width = statusBarWidth(terminalWidth);
+    const toolName = handle.toolName?.trim() || "exec";
     const label = handle.description?.trim() || handle.command;
-    const text = `↳ exec still running · Ctrl+B to detach · ${truncateMiddle(label, Math.max(12, width - 38))}`;
+    const text = `↳ ${toolName} still running · Ctrl+B to detach · ${truncateMiddle(label, Math.max(12, width - toolName.length - 33))}`;
     return e(Text, { color: "yellow" }, fitToWidth(text, width));
 }
-function SubagentLivePanel({ activities, width: terminalWidth, terminalRows, compact, animationTick }) {
+function SubagentLivePanel({ activities, width: terminalWidth, animationTick }) {
     const width = statusBarWidth(terminalWidth);
-    const rows = subagentLivePanelRenderRows(activities, terminalRows, compact);
-    if (rows <= 0)
-        return null;
     const sorted = sortAgentActivitiesForPanel(activities);
     const selected = sorted[0];
     if (!selected)
         return null;
     const activeCount = activities.filter((activity) => activity.status === "running" || activity.status === "pending").length;
-    const header = `◆ subagents: ${activeCount} active${activities.length > activeCount ? ` · ${activities.length - activeCount} recent` : ""}`;
-    if (rows <= 1) {
-        return e(Text, { color: "yellow" }, fitToWidth(`${header} · ${compactAgentSummary(selected, width - header.length - 3)}`, width));
-    }
-    const detailLines = buildSubagentDetailLines(selected, sorted, animationTick);
-    return e(Box, { flexDirection: "column", width, overflow: "hidden" }, e(Text, { color: "yellow" }, fitToWidth(header, width)), ...detailLines.map((line, index) => e(Text, {
-        key: `agent-detail-${selected.agentId}-${index}`,
-        color: line.color,
-    }, fitToWidth(line.text, width))));
-}
-const SUBAGENT_DETAIL_ROWS = 3;
-function subagentLivePanelRenderRows(activities, terminalRows, compact = false) {
-    if (activities.length === 0)
-        return 0;
-    if (compact || terminalRows < 22 || activities.length > 1)
-        return 1;
-    return 1 + SUBAGENT_DETAIL_ROWS;
+    const recentCount = Math.max(0, activities.length - activeCount);
+    const countText = activeCount > 1
+        ? `${activeCount} active${recentCount ? ` · ${recentCount} recent` : ""}`
+        : recentCount && activeCount === 0
+            ? `${recentCount} recent`
+            : "";
+    const text = `↳ subagent ${subagentStatusText(selected.status, animationTick)}${countText ? ` · ${countText}` : ""} · ${compactAgentSummary(selected, width)}`;
+    return e(Text, { color: statusColor(selected.status) }, fitToWidth(text, width));
 }
 function sortAgentActivitiesForPanel(activities) {
     const rank = (status) => {
@@ -2038,76 +2058,35 @@ function sortAgentActivitiesForPanel(activities) {
     };
     return [...activities].sort((left, right) => rank(left.status) - rank(right.status) || right.updatedAt.localeCompare(left.updatedAt));
 }
-function buildSubagentDetailLines(selected, sorted, animationTick) {
-    const spinner = selected.status === "running" ? spinnerFrame(animationTick) : statusGlyph(selected.status);
-    const elapsed = formatElapsed(Date.now() - new Date(selected.startedAt).getTime());
-    const headerLine = `${spinner} ${selected.description || selected.agentId} · ${elapsed}`;
-    const currentLine = selected.currentTool
-        ? `→ ${selected.currentTool.name}${selected.currentTool.inputPreview ? ` · ${selected.currentTool.inputPreview}` : ""}`
-        : selected.error
-            ? `✖ ${selected.error}`
-            : selected.resultPreview
-                ? `✓ ${selected.resultPreview}`
-                : selected.lastText
-                    ? `• ${selected.lastText}`
-                    : `• ${selected.prompt}`;
-    const recent = selected.timeline.slice(-2).map((entry) => `${timelinePrefix(entry)} ${formatTimelineEntry(entry, 240)}`);
-    const otherRunning = sorted
-        .filter((activity) => activity.agentId !== selected.agentId && (activity.status === "running" || activity.status === "pending"))
-        .slice(0, 2)
-        .map((activity) => compactAgentSummary(activity, 180));
-    const tail = [...recent, ...otherRunning.map((summary) => `· ${summary}`)].find((line) => line.trim()) ?? `tools:${selected.totalToolUseCount}`;
-    return [
-        { text: headerLine, color: statusColor(selected.status) },
-        { text: currentLine, color: selected.error ? "red" : selected.currentTool ? "#d4b04c" : "yellow" },
-        { text: tail, color: "gray" },
-    ];
-}
 function compactAgentSummary(activity, maxLength) {
     const current = activity.currentTool
         ? `${activity.currentTool.name}${activity.currentTool.inputPreview ? ` ${activity.currentTool.inputPreview}` : ""}`
-        : activity.lastText ?? activity.resultPreview ?? activity.error ?? activity.prompt;
+        : firstSafeSubagentPreview(activity.resultPreview, activity.error, activity.lastText, activity.prompt);
     const elapsed = formatElapsed(Date.now() - new Date(activity.startedAt).getTime());
     return truncateMiddle(`${activity.description || activity.agentId} · ${elapsed} · tools:${activity.totalToolUseCount} · ${current.replace(/\s+/g, " ")}`, Math.max(8, maxLength));
 }
-function formatTimelineEntry(entry, maxLength) {
-    const detail = entry.detail ? ` · ${entry.detail.replace(/\s+/g, " ")}` : "";
-    return truncateMiddle(`${entry.title}${detail}`, Math.max(8, maxLength));
-}
-function timelinePrefix(entry) {
-    if (entry.kind === "tool_start")
-        return "→";
-    if (entry.kind === "tool_result")
-        return entry.status === "failed" ? "✖" : "←";
-    if (entry.kind === "thinking")
-        return "◆";
-    if (entry.kind === "error")
-        return "✖";
-    if (entry.kind === "status")
-        return "•";
-    return "assistant:";
-}
-function timelineColor(entry) {
-    if (entry.status === "failed" || entry.kind === "error")
-        return "red";
-    if (entry.kind === "tool_start" || entry.kind === "tool_result")
-        return "#d4b04c";
-    if (entry.kind === "thinking")
-        return THINKING_COLOR;
-    if (entry.kind === "status")
-        return "gray";
-    return "green";
+function firstSafeSubagentPreview(...values) {
+    return values.find((value) => value && !isInternalContinuationPreview(value)) ?? "working";
+}
+function isInternalContinuationPreview(value) {
+    const normalized = value.toLowerCase();
+    return normalized.includes("<compact_state>")
+        || normalized.includes("internal continuation state")
+        || normalized.includes("auto compact")
+        || normalized.includes("conversation summary generated by compact");
 }
-function statusGlyph(status) {
+function subagentStatusText(status, animationTick) {
+    if (status === "running")
+        return `still running ${spinnerFrame(animationTick)}`;
+    if (status === "pending")
+        return "pending";
     if (status === "completed")
-        return "✓";
+        return "completed";
     if (status === "failed")
-        return "✖";
+        return "failed";
     if (status === "killed")
-        return "■";
-    if (status === "pending")
-        return "…";
-    return "●";
+        return "killed";
+    return status;
 }
 function statusColor(status) {
     if (status === "completed")