neoctl 0.2.4 → 0.2.6

package/dist/repl/index.js

@@ -22,17 +22,60 @@ import { searchTool } from "../tools/builtins/search-tool.js";
 import { planTool } from "../tools/builtins/plan-tool.js";
 import { createOpenAIImageGenerationTool } from "../tools/builtins/image-generation-tool.js";
 import { createLoadImageTool } from "../tools/builtins/image-loader-tool.js";
+import { createSecretTools } from "../tools/builtins/secret-tools.js";
+import { SecretStore } from "../secrets/secret-store.js";
+import { InMemorySecretRedactionRegistry } from "../secrets/secret-redaction.js";
 import { createAgentTool, resumeAgentTask } from "../agents/agent-tool.js";
+import { AgentActivityStore } from "../agents/agent-activity.js";
 import { createTaskTools } from "../tasks/task-tools.js";
 import { TaskStore } from "../tasks/task-store.js";
 import { cliHelpText, isModelReasoningArgument, isValidReplCommandLine, parseCliReplCommandArgs, parseReplCommand, helpText, replCommandDefinitions } from "./commands.js";
 import { estimateMarkdownLineCount, markdownRenderKey, MarkdownText } from "./markdown-renderer.js";
+import { DefaultContextManager } from "../context/context-manager.js";
+import { buildEffectiveSystemPrompt } from "../context/prompts.js";
 import { writeSessionMarkdownExport } from "../session/session-export.js";
 import { readClipboard } from "./clipboard.js";
 import { formatTipLine, initialTipIndex, tipAt } from "../tips.js";
 import { openDirectory } from "../open-directory.js";
 import { runWebServer } from "../web/index.js";
+import { getNeoctlHome } from "../paths.js";
+import { FileSystemSkillCatalog } from "../skills/skill-filesystem.js";
+import { createSkillAwareCanUseTool, createSkillTool, requireSkillName } from "../skills/skill-tool.js";
+import { createSkillManagementTools } from "../skills/skill-management-tools.js";
 const e = React.createElement;
+class ReplForegroundExecDetachRegistry {
+    handle;
+    subscribers = new Set();
+    set(handle) {
+        this.handle = handle;
+        this.notify();
+        return () => {
+            if (this.handle === handle) {
+                this.handle = undefined;
+                this.notify();
+            }
+        };
+    }
+    current() {
+        return this.handle;
+    }
+    subscribe(listener) {
+        this.subscribers.add(listener);
+        return () => {
+            this.subscribers.delete(listener);
+        };
+    }
+    detachCurrent() {
+        const handle = this.handle;
+        if (!handle)
+            return { ok: false, message: "No foreground exec command is currently running" };
+        return handle.detach();
+    }
+    notify() {
+        for (const listener of this.subscribers)
+            listener();
+    }
+}
 class SessionUsageTracker {
     totals = emptyUsageTotals();
     lastUsage;
@@ -128,6 +171,50 @@ function binaryName() {
     const name = parsed.name || "neo";
     return name === "index" ? "neo" : name;
 }
+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` REPL 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 createTaskNotificationSource(taskStore) {
     return {
         collectUnnotifiedCompletions() {
@@ -150,10 +237,22 @@ async function createRuntime() {
     const communicationLogger = new CommunicationLogger();
     const modelGateway = new LoggingModelGateway(createModelGatewayFromProcessEnv(process.env), communicationLogger);
     const taskStore = new TaskStore();
+    const agentActivityStore = new AgentActivityStore();
+    const foregroundExecDetach = new ReplForegroundExecDetachRegistry();
+    const secretStore = await SecretStore.open();
+    const secretRedactions = new InMemorySecretRedactionRegistry();
     const tools = new ToolRegistry();
+    const skillWorkspaceRoot = path.resolve(process.cwd(), ".neo", "skills");
+    const skills = new FileSystemSkillCatalog({
+        roots: [
+            { root: skillWorkspaceRoot, kind: "workspace" },
+            { root: path.resolve(getNeoctlHome(), "skills"), kind: "user" },
+        ],
+        createRoot: skillWorkspaceRoot,
+    });
     tools.register(editTool);
     tools.register(writeTool);
-    tools.register(createExecTool({ taskStore }));
+    tools.register(createExecTool({ taskStore, foregroundDetachRegistry: foregroundExecDetach }));
     tools.register(listDirectoryTool);
     tools.register(readFileTool);
     tools.register(grepTool);
@@ -162,13 +261,20 @@ async function createRuntime() {
     if (modelConfig?.provider === "openai")
         tools.register(createOpenAIImageGenerationTool());
     tools.register(planTool);
-    const agentRuntime = { modelGateway, tools, taskStore };
+    for (const tool of createSecretTools())
+        tools.register(tool);
+    tools.register(createSkillTool(skills));
+    for (const tool of createSkillManagementTools(skills, { requireApproval: true, allowDelete: false }))
+        tools.register(tool);
+    const agentRuntime = { modelGateway, tools, taskStore, agentActivityStore };
     tools.register(createAgentTool(agentRuntime));
     const resumeHandler = async (taskId, directive) => {
         const dummyContext = {
             agentId: "main",
             tools,
             appState: new (await import("../app/app-state.js")).InMemoryAppState("main"),
+            secrets: secretStore,
+            secretRedactions,
             emit: () => undefined,
         };
         return resumeAgentTask(taskId, directive, agentRuntime, taskStore, dummyContext);
@@ -183,6 +289,10 @@ async function createRuntime() {
         reasoning: modelConfig?.defaultReasoning,
         modelGateway,
         tools,
+        contextManager: new SkillCatalogContextManager(skills),
+        canUseTool: createSkillAwareCanUseTool(skills),
+        secrets: secretStore,
+        secretRedactions,
         taskNotificationSource,
         commands: replCommandDefinitions.map((command) => command.usage),
         session: {
@@ -204,7 +314,12 @@ async function createRuntime() {
         agentRuntime,
         usage: new SessionUsageTracker(),
         taskStore,
+        agentActivityStore,
+        foregroundExecDetach,
         tools,
+        skills,
+        secretStore,
+        skillWorkspaceRoot,
         initialMetrics,
         defaultReasoning: modelConfig?.defaultReasoning,
         envPath: process.env.NEO_ENV_FILE?.trim() ? path.resolve(process.env.NEO_ENV_FILE.trim()) : envLoad.userDotEnvPath,
@@ -217,7 +332,7 @@ function syncImageGenerationTool(runtime, provider) {
         runtime.tools.register(createOpenAIImageGenerationTool());
 }
 function formatCreatedEnvNotice(path) {
-    return `Created default config file: ${path}\nSet MODEL_PROVIDER and the matching provider section (for example OPENAI_API_KEY, ANTHROPIC_API_KEY, or KIMI_API_KEY), then restart neo.`;
+    return `Created default config file: ${path}\nSet MODEL_PROVIDER and the matching provider section (OPENAI_API_KEY or ANTHROPIC_API_KEY), then restart neo.`;
 }
 function parseResumeFlag(value) {
     if (!value)
@@ -227,6 +342,34 @@ function parseResumeFlag(value) {
 function activeBackgroundTasks(runtime) {
     return runtime.taskStore.list().filter((task) => !runtime.taskStore.isTerminal(task));
 }
+function debounceVoid(callback, delayMs) {
+    let timer;
+    return {
+        run: () => {
+            if (timer)
+                clearTimeout(timer);
+            timer = setTimeout(() => {
+                timer = undefined;
+                callback();
+            }, delayMs);
+        },
+        cancel: () => {
+            if (!timer)
+                return;
+            clearTimeout(timer);
+            timer = undefined;
+        },
+    };
+}
+function activeAgentActivities(runtime) {
+    const now = Date.now();
+    return runtime.agentActivityStore.list().filter((activity) => {
+        if (activity.status === "running" || activity.status === "pending")
+            return true;
+        const completedAt = activity.completedAt ? new Date(activity.completedAt).getTime() : new Date(activity.updatedAt).getTime();
+        return Number.isFinite(completedAt) && now - completedAt < SUBAGENT_COMPLETED_LINGER_MS;
+    });
+}
 function runningSessionIds(runs) {
     return [...runs.keys()];
 }
@@ -393,6 +536,9 @@ function InkRepl({ runtime, initialCommandLine }) {
     const [status, setStatus] = useState(() => initialStatus(runtime));
     const sessionTitleRef = useRef(sessionTerminalTitle(runtime.engine.snapshot().session));
     const [backgroundTasks, setBackgroundTasks] = useState(() => activeBackgroundTasks(runtime));
+    const [agentActivities, setAgentActivities] = useState(() => runtime.agentActivityStore.list());
+    const [foregroundExecDetachHandle, setForegroundExecDetachHandle] = useState(() => runtime.foregroundExecDetach.current());
+    const [showForegroundExecDetachHint, setShowForegroundExecDetachHint] = useState(false);
     const [backgroundSessionRuns, setBackgroundSessionRuns] = useState([]);
     const backgroundSessionRunsRef = useRef(new Map());
     const suppressReattachedStreamingRef = useRef(new Set());
@@ -403,6 +549,8 @@ function InkRepl({ runtime, initialCommandLine }) {
     const backgroundTaskCount = backgroundTasks.length;
     const terminalTitleWorking = isActivePhase(status.phase) || backgroundTaskCount > 0 || backgroundSessionRuns.length > 0;
     const [sessionsBrowser, setSessionsBrowser] = useState(undefined);
+    const [skillsBrowser, setSkillsBrowser] = useState(undefined);
+    const [secretsBrowser, setSecretsBrowser] = useState(undefined);
     const inputRef = useRef(input);
     const queuedInputRef = useRef(undefined);
     const cursorRef = useRef(cursor);
@@ -418,6 +566,8 @@ function InkRepl({ runtime, initialCommandLine }) {
     const [pasteStatus, setPasteStatus] = useState(undefined);
     const pasteStatusTimerRef = useRef(undefined);
     const [slashCompletionIndex, setSlashCompletionIndex] = useState(0);
+    const [skillCompletions, setSkillCompletions] = useState([]);
+    const [secretCompletions, setSecretCompletions] = useState([]);
     const [loginForm, setLoginForm] = useState(undefined);
     const loginFormRef = useRef(undefined);
     useEffect(() => {
@@ -429,16 +579,48 @@ function InkRepl({ runtime, initialCommandLine }) {
         };
     }, []);
     useEffect(() => {
-        if (!busy && backgroundTaskCount === 0 && backgroundSessionRuns.length === 0)
+        if (!busy && backgroundTaskCount === 0 && backgroundSessionRuns.length === 0 && agentActivities.length === 0)
             return undefined;
-        const interval = setInterval(() => setAnimationTick((current) => current + 1), REPL_ANIMATION_INTERVAL_MS);
+        const interval = setInterval(() => {
+            setAnimationTick((current) => current + 1);
+            setAgentActivities(activeAgentActivities(runtime));
+        }, REPL_ANIMATION_INTERVAL_MS);
         return () => clearInterval(interval);
-    }, [busy, backgroundTaskCount, backgroundSessionRuns.length]);
+    }, [busy, backgroundTaskCount, backgroundSessionRuns.length, agentActivities.length, runtime]);
     useEffect(() => {
         const updateBackgroundTasks = () => setBackgroundTasks(activeBackgroundTasks(runtime));
         updateBackgroundTasks();
         return runtime.taskStore.subscribe(updateBackgroundTasks);
     }, [runtime]);
+    useEffect(() => {
+        const updateAgentActivities = () => setAgentActivities(activeAgentActivities(runtime));
+        const debouncedUpdateAgentActivities = debounceVoid(updateAgentActivities, SUBAGENT_ACTIVITY_UPDATE_DEBOUNCE_MS);
+        updateAgentActivities();
+        const unsubscribe = runtime.agentActivityStore.subscribe(debouncedUpdateAgentActivities.run);
+        return () => {
+            unsubscribe();
+            debouncedUpdateAgentActivities.cancel();
+        };
+    }, [runtime]);
+    useEffect(() => {
+        const updateForegroundExecDetachHandle = () => setForegroundExecDetachHandle(runtime.foregroundExecDetach.current());
+        updateForegroundExecDetachHandle();
+        return runtime.foregroundExecDetach.subscribe(updateForegroundExecDetachHandle);
+    }, [runtime]);
+    useEffect(() => {
+        if (!foregroundExecDetachHandle) {
+            setShowForegroundExecDetachHint(false);
+            return undefined;
+        }
+        const elapsedMs = Date.now() - foregroundExecDetachHandle.startedAt;
+        if (elapsedMs >= FOREGROUND_EXEC_DETACH_HINT_DELAY_MS) {
+            setShowForegroundExecDetachHint(true);
+            return undefined;
+        }
+        setShowForegroundExecDetachHint(false);
+        const timer = setTimeout(() => setShowForegroundExecDetachHint(true), FOREGROUND_EXEC_DETACH_HINT_DELAY_MS - elapsedMs);
+        return () => clearTimeout(timer);
+    }, [foregroundExecDetachHandle]);
     useEffect(() => {
         if (!terminalTitleWorking) {
             setTerminalTitlePrefix(TERMINAL_TITLE_READY_PREFIX);
@@ -488,6 +670,30 @@ function InkRepl({ runtime, initialCommandLine }) {
         loginFormRef.current = next;
         setLoginForm(next);
     };
+    const refreshSkillCompletions = useCallback(async () => {
+        try {
+            const skills = await runtime.skills.list();
+            setSkillCompletions(skills.map((skill) => ({ name: skill.name, description: skill.description, execution: skill.execution, tags: skill.tags })));
+        }
+        catch {
+            setSkillCompletions([]);
+        }
+    }, [runtime]);
+    const refreshSecretCompletions = useCallback(async () => {
+        try {
+            const secrets = await runtime.secretStore.list();
+            setSecretCompletions(secrets.map((secret) => ({ key: secret.key, status: secret.status, length: secret.length, requestReason: secret.requestReason })));
+        }
+        catch {
+            setSecretCompletions([]);
+        }
+    }, [runtime]);
+    useEffect(() => {
+        void refreshSkillCompletions();
+    }, [refreshSkillCompletions]);
+    useEffect(() => {
+        void refreshSecretCompletions();
+    }, [refreshSecretCompletions]);
     const syncAttachmentsForText = (text) => {
         const next = attachmentsRef.current.filter((attachment) => text.includes(attachment.label));
         if (next.length === attachmentsRef.current.length)
@@ -855,6 +1061,7 @@ function InkRepl({ runtime, initialCommandLine }) {
     };
     const handleCommandOrPrompt = async (text, submitAttachments = []) => {
         const command = parseReplCommand(text);
+        let promptText = command.type === "input" ? command.text : text;
         if (command.type === "exit") {
             app.exit();
             return;
@@ -990,11 +1197,48 @@ function InkRepl({ runtime, initialCommandLine }) {
         }
         if (command.type === "sessions") {
             detachRunningForeground("session browser");
+            setSkillsBrowser(undefined);
+            setSecretsBrowser(undefined);
             await handleSessionsCommand(runtime, runningSessionIds(backgroundSessionRunsRef.current), setSessionsBrowser, (line) => append(line));
             return;
         }
+        if (command.type === "secret") {
+            try {
+                if (command.action === "list") {
+                    setSessionsBrowser(undefined);
+                    setSkillsBrowser(undefined);
+                    await handleSecretsCommand(runtime, setSecretsBrowser, (line) => append(line));
+                }
+                else {
+                    append(await handleSecretCommand(command, runtime));
+                    void refreshSecretCompletions();
+                }
+            }
+            catch (error) {
+                append({ kind: "error", text: error instanceof Error ? error.message : String(error) });
+            }
+            return;
+        }
+        if (command.type === "skill") {
+            if (command.action === "list") {
+                setSessionsBrowser(undefined);
+                setSecretsBrowser(undefined);
+                await handleSkillsCommand(runtime, setSkillsBrowser, (line) => append(line));
+                return;
+            }
+            if (command.action !== "invoke" || !command.name || !command.args) {
+                append(await handleSkillCommand(command, runtime));
+                if (command.action === "import" || command.action === "delete")
+                    void refreshSkillCompletions();
+                return;
+            }
+            promptText = renderSkillInvocationPrompt(command.name, command.args);
+            text = `/skill ${command.name} ${command.args}`;
+        }
         if (command.type === "login") {
             setSessionsBrowser(undefined);
+            setSkillsBrowser(undefined);
+            setSecretsBrowser(undefined);
             setLoginFormState(createLoginFormState(runtime.envPath));
             append(systemLine("Opening provider login. Use ↑/↓ to choose, Enter to continue/save, Esc to cancel."));
             return;
@@ -1023,11 +1267,11 @@ function InkRepl({ runtime, initialCommandLine }) {
             }
             return;
         }
-        if (text.trimStart().startsWith("/")) {
+        if (command.type !== "skill" && text.trimStart().startsWith("/")) {
             append({ kind: "error", text: `Unknown or incomplete command: ${text.trim()}\nType /help for commands.` });
             return;
         }
-        const promptPayload = buildPromptPayload(command.text, submitAttachments);
+        const promptPayload = buildPromptPayload(promptText, submitAttachments);
         append({ kind: "user", text });
         const runToken = ++foregroundRunTokenRef.current;
         const abortController = new AbortController();
@@ -1112,6 +1356,8 @@ function InkRepl({ runtime, initialCommandLine }) {
         clearPendingToolResultTimers();
         setStatus(initialStatus(runtime));
         setSessionsBrowser(undefined);
+        setSkillsBrowser(undefined);
+        setSecretsBrowser(undefined);
         setLoginFormState(undefined);
         setQueuedPromptState(undefined);
         setPromptState("", 0);
@@ -1131,7 +1377,7 @@ function InkRepl({ runtime, initialCommandLine }) {
     const promptDisplayCursor = cursor;
     const promptLayoutText = activePlaceholder ? ` ${activePlaceholder}` : promptDisplayText;
     const promptLayoutCursor = activePlaceholder ? 0 : promptDisplayCursor;
-    const slashCompletions = inputLockedByQueue || (input.length === 0 && promptPlaceholder !== undefined) || loginForm ? [] : slashCommandCompletions(input, cursor);
+    const slashCompletions = inputLockedByQueue || (input.length === 0 && promptPlaceholder !== undefined) || loginForm ? [] : slashCommandCompletions(input, cursor, skillCompletions, secretCompletions);
     const visibleSlashCompletionCount = slashCompletions.length;
     const selectedSlashCompletionIndex = visibleSlashCompletionCount === 0
         ? 0
@@ -1147,10 +1393,18 @@ function InkRepl({ runtime, initialCommandLine }) {
         const blockIndex = staticLines.length + i;
         return sum + (blockIndex > 0 ? MESSAGE_BLOCK_SPACING_LINES : 0);
     }, 0);
-    const statusRenderRows = STATUS_BAR_RENDER_ROWS + backgroundTaskStatusRenderRows(backgroundTasks.length);
-    const sessionsBrowserHeight = sessionsBrowser ? sessionsBrowserViewHeight(sessionsBrowser) : 0;
+    const subagentRows = subagentLivePanelRenderRows(agentActivities, terminalSize.rows);
+    const nonAgentBackgroundTasks = backgroundTasks.filter((task) => task.type !== "agent");
+    const statusRenderRows = STATUS_BAR_RENDER_ROWS + (showForegroundExecDetachHint && foregroundExecDetachHandle ? FOREGROUND_EXEC_DETACH_HINT_RENDER_ROWS : 0) + subagentRows + backgroundTaskStatusRenderRows(subagentRows > 0 ? nonAgentBackgroundTasks.length : backgroundTasks.length);
+    const managementBrowserHeight = sessionsBrowser
+        ? sessionsBrowserViewHeight(sessionsBrowser)
+        : skillsBrowser
+            ? skillsBrowserViewHeight(skillsBrowser)
+            : secretsBrowser
+                ? secretsBrowserViewHeight(secretsBrowser)
+                : 0;
     const loginFormHeight = loginForm ? loginFormViewHeight(loginForm) : 0;
-    const liveViewportLines = Math.max(MIN_LIVE_VIEWPORT_LINES, terminalSize.rows - promptHeight - statusRenderRows - sessionsBrowserHeight - loginFormHeight - dynamicMarginOverhead - 1);
+    const liveViewportLines = Math.max(MIN_LIVE_VIEWPORT_LINES, terminalSize.rows - promptHeight - statusRenderRows - managementBrowserHeight - loginFormHeight - dynamicMarginOverhead - 1);
     useInput((value, key) => {
         if (isTerminalFocusInSequence(value)) {
             terminalFocusedRef.current = true;
@@ -1171,6 +1425,13 @@ function InkRepl({ runtime, initialCommandLine }) {
             void handleClipboardPaste();
             return;
         }
+        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(result.message));
+            return;
+        }
         if (key.ctrl && value === "c") {
             if (inputRef.current.length > 0) {
                 setPromptState("", 0);
@@ -1245,15 +1506,128 @@ function InkRepl({ runtime, initialCommandLine }) {
             }
             return;
         }
+        if (skillsBrowser) {
+            if (key.escape) {
+                setSkillsBrowser(undefined);
+                return;
+            }
+            if (key.upArrow) {
+                setSkillsBrowser((current) => current ? movePagedSelection(current, -1) : current);
+                return;
+            }
+            if (key.downArrow) {
+                setSkillsBrowser((current) => current ? movePagedSelection(current, 1) : current);
+                return;
+            }
+            if (key.leftArrow || key.pageUp) {
+                setSkillsBrowser((current) => current ? movePagedPage(current, -1) : current);
+                return;
+            }
+            if (key.rightArrow || key.pageDown) {
+                setSkillsBrowser((current) => current ? movePagedPage(current, 1) : current);
+                return;
+            }
+            const selected = skillsBrowser.skills[pagedAbsoluteIndex(skillsBrowser)];
+            if (key.return && selected) {
+                setSkillsBrowser(undefined);
+                append(systemLine(formatSkillDetails(selected), EXPANDED_SUMMARY_MAX_LINES));
+                return;
+            }
+            if (value.toLowerCase() === "i" && selected) {
+                setSkillsBrowser(undefined);
+                setPromptState(`/skill ${selected.name} `, selected.name.length + 8);
+                return;
+            }
+            if ((key.delete || key.backspace || value.toLowerCase() === "d") && selected) {
+                void handleSkillDeleteByName(selected.name, runtime).then((line) => {
+                    append(line);
+                    void refreshSkillCompletions();
+                    void handleSkillsCommand(runtime, setSkillsBrowser, (nextLine) => append(nextLine));
+                });
+                return;
+            }
+            if (value.toLowerCase() === "a") {
+                setSkillsBrowser(undefined);
+                setPromptState("/skill import ", 14);
+                return;
+            }
+            return;
+        }
+        if (secretsBrowser) {
+            if (key.escape) {
+                setSecretsBrowser(undefined);
+                return;
+            }
+            if (key.upArrow) {
+                setSecretsBrowser((current) => current ? movePagedSelection(current, -1) : current);
+                return;
+            }
+            if (key.downArrow) {
+                setSecretsBrowser((current) => current ? movePagedSelection(current, 1) : current);
+                return;
+            }
+            if (key.leftArrow || key.pageUp) {
+                setSecretsBrowser((current) => current ? movePagedPage(current, -1) : current);
+                return;
+            }
+            if (key.rightArrow || key.pageDown) {
+                setSecretsBrowser((current) => current ? movePagedPage(current, 1) : current);
+                return;
+            }
+            const selected = secretsBrowser.secrets[pagedAbsoluteIndex(secretsBrowser)];
+            if (key.return && selected) {
+                setSecretsBrowser(undefined);
+                void handleSecretCommand({ type: "secret", action: "info", key: selected.key }, runtime).then((line) => append(line));
+                return;
+            }
+            if (value.toLowerCase() === "s" && selected) {
+                setSecretsBrowser(undefined);
+                setPromptState(`/secret set ${selected.key} `, selected.key.length + 13);
+                return;
+            }
+            if (value.toLowerCase() === "r" && selected) {
+                setSecretsBrowser(undefined);
+                setPromptState(`/secret rename ${selected.key} `, selected.key.length + 16);
+                return;
+            }
+            if ((key.delete || key.backspace || value.toLowerCase() === "d") && selected) {
+                void handleSecretCommand({ type: "secret", action: "delete", key: selected.key }, runtime).then((line) => {
+                    append(line);
+                    void refreshSecretCompletions();
+                    void handleSecretsCommand(runtime, setSecretsBrowser, (nextLine) => append(nextLine));
+                }).catch((error) => append({ kind: "error", text: error instanceof Error ? error.message : String(error) }));
+                return;
+            }
+            if (value.toLowerCase() === "a") {
+                setSecretsBrowser(undefined);
+                setPromptState("/secret set ", 12);
+                return;
+            }
+            if (value.toLowerCase() === "e") {
+                setSecretsBrowser(undefined);
+                setPromptState("/secret request ", 16);
+                return;
+            }
+            return;
+        }
         if (key.return) {
             const currentText = inputRef.current;
             const currentCursor = cursorRef.current;
-            const completion = selectedSlashCommandCompletion(currentText, currentCursor, slashCompletionIndexRef.current);
+            const completion = selectedSlashCommandCompletion(currentText, currentCursor, slashCompletionIndexRef.current, skillCompletions, secretCompletions);
             if (completion !== undefined && completion.kind === "command" && completion.arguments !== "none") {
                 const nextText = `${completion.insertText} ${currentText.slice(currentCursor)}`;
                 setPromptState(nextText, completion.insertText.length + 1);
                 return;
             }
+            if (currentText.trimEnd() === "/skill" || currentText.trimEnd() === "/secret") {
+                void submitLine(currentText);
+                return;
+            }
+            if (completion !== undefined && (completion.kind === "skill-action" || completion.kind === "secret-action")) {
+                const nextText = `${completion.insertText}${currentText.slice(currentCursor)}`;
+                setPromptState(nextText, completion.insertText.length);
+                return;
+            }
             if (currentText.trimEnd() === "/model" && completion?.kind !== "command") {
                 void submitLine(currentText);
                 return;
@@ -1274,7 +1648,7 @@ function InkRepl({ runtime, initialCommandLine }) {
             return;
         }
         if (key.leftArrow) {
-            const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current);
+            const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current, skillCompletions, secretCompletions);
             if (completionCount > SLASH_COMPLETION_PAGE_SIZE) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + completionCount - SLASH_COMPLETION_PAGE_SIZE) % completionCount);
                 return;
@@ -1287,7 +1661,7 @@ function InkRepl({ runtime, initialCommandLine }) {
             return;
         }
         if (key.rightArrow) {
-            const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current);
+            const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current, skillCompletions, secretCompletions);
             if (completionCount > SLASH_COMPLETION_PAGE_SIZE) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + SLASH_COMPLETION_PAGE_SIZE) % completionCount);
                 return;
@@ -1318,7 +1692,7 @@ function InkRepl({ runtime, initialCommandLine }) {
                 setTipIndex((current) => current - 1);
                 return;
             }
-            const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current);
+            const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current, skillCompletions, secretCompletions);
             if (completionCount > 0) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + completionCount - 1) % completionCount);
                 return;
@@ -1335,7 +1709,7 @@ function InkRepl({ runtime, initialCommandLine }) {
                 setTipIndex((current) => current + 1);
                 return;
             }
-            const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current);
+            const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current, skillCompletions, secretCompletions);
             if (completionCount > 0) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + 1) % completionCount);
                 return;
@@ -1361,7 +1735,7 @@ function InkRepl({ runtime, initialCommandLine }) {
                 return;
             }
             const currentCursor = cursorRef.current;
-            const completions = slashCommandCompletions(currentText, currentCursor);
+            const completions = slashCommandCompletions(currentText, currentCursor, skillCompletions, secretCompletions);
             const completion = completions[Math.min(slashCompletionIndexRef.current, completions.length - 1)];
             if (completion !== undefined) {
                 const nextText = `${completion.insertText}${currentText.slice(currentCursor)}`;
@@ -1374,7 +1748,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: dynamicLines, width, liveMaxLines: liveViewportLines, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, loginForm ? e(LoginFormView, { state: loginForm, width }) : null, e(StatusBar, { status, animationTick, width }), backgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: backgroundTasks, 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: dynamicLines, width, liveMaxLines: liveViewportLines, 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, 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, liveMaxLines, lineIndexOffset = 0, onMarkdownRenderComplete }) {
     const contentWidth = messageContentWidth(width);
@@ -1731,6 +2105,139 @@ function backgroundTaskStatusRenderRows(taskCount) {
         return 0;
     return 1 + Math.min(taskCount, 2);
 }
+function ForegroundExecDetachHintLine({ handle, width: terminalWidth }) {
+    const width = statusBarWidth(terminalWidth);
+    const label = handle.description?.trim() || handle.command;
+    const text = `↳ exec still running · Ctrl+B to detach · ${truncateMiddle(label, Math.max(12, width - 38))}`;
+    return e(Text, { color: "yellow" }, fitToWidth(text, width));
+}
+function SubagentLivePanel({ activities, width: terminalWidth, terminalRows, animationTick }) {
+    const width = statusBarWidth(terminalWidth);
+    const rows = subagentLivePanelRenderRows(activities, terminalRows);
+    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` : ""} | auto: latest activity`;
+    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) {
+    if (activities.length === 0)
+        return 0;
+    if (terminalRows < 18)
+        return 1;
+    return 1 + SUBAGENT_DETAIL_ROWS;
+}
+function sortAgentActivitiesForPanel(activities) {
+    const rank = (status) => {
+        if (status === "running")
+            return 0;
+        if (status === "pending")
+            return 1;
+        if (status === "failed" || status === "killed")
+            return 2;
+        return 3;
+    };
+    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} · ${agentModeLabel(selected)} · ${selected.agentType} · ${selected.status} · ${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;
+    return truncateMiddle(`${activity.description || activity.agentId} · ${agentModeLabel(activity)} · ${activity.status} · tools:${activity.totalToolUseCount} · ${current.replace(/\s+/g, " ")}`, Math.max(8, maxLength));
+}
+function agentModeLabel(activity) {
+    if (activity.mode === "explore")
+        return "explore";
+    return activity.mode;
+}
+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 statusGlyph(status) {
+    if (status === "completed")
+        return "✓";
+    if (status === "failed")
+        return "✖";
+    if (status === "killed")
+        return "■";
+    if (status === "pending")
+        return "…";
+    return "●";
+}
+function statusColor(status) {
+    if (status === "completed")
+        return "green";
+    if (status === "failed" || status === "killed")
+        return "red";
+    if (status === "pending")
+        return "gray";
+    return "yellow";
+}
+function spinnerFrame(tick) {
+    return ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"][tick % 10] ?? "●";
+}
 function BackgroundTaskStatusLine({ tasks, width: terminalWidth }) {
     const width = statusBarWidth(terminalWidth);
     const summary = `◇ background tools: ${tasks.length} task${tasks.length === 1 ? "" : "s"}`;
@@ -1806,7 +2313,21 @@ function fitStatusSegments(segments, width) {
 const SLASH_COMPLETION_PAGE_SIZE = 10;
 const MODEL_REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh", "max"];
 const MODEL_REASONING_CONTROL_CHOICES = ["default", "off"];
-function slashCommandCompletions(text, cursor) {
+const SKILL_COMMAND_ACTIONS = [
+    { name: "list", description: "Open the skill management browser", aliases: ["ls"] },
+    { name: "import", description: "Import by linking a skill directory" },
+    { name: "delete", description: "Delete a workspace skill link/directory", aliases: ["remove", "rm"] },
+];
+const SECRET_COMMAND_ACTIONS = [
+    { name: "list", description: "List secret keys/status/length; add --show to print values" },
+    { name: "get", description: "Print one secret value in the REPL" },
+    { name: "set", description: "Set a plaintext secret value" },
+    { name: "request", description: "Create an empty placeholder secret", aliases: ["empty"] },
+    { name: "info", description: "Show one secret's metadata" },
+    { name: "rename", description: "Rename a secret key", aliases: ["mv"] },
+    { name: "delete", description: "Delete a secret", aliases: ["remove", "rm"] },
+];
+function slashCommandCompletions(text, cursor, skills = [], secrets = []) {
     const safeCursor = Math.max(0, Math.min(cursor, text.length));
     const prefix = text.slice(0, safeCursor);
     if (!prefix.startsWith("/") || /\r|\n/.test(prefix))
@@ -1819,6 +2340,12 @@ function slashCommandCompletions(text, cursor) {
     if (prefix.startsWith("/model") && (prefix.length === "/model".length || prefix["/model".length] === " ")) {
         return modelCommandCompletions(prefix);
     }
+    if (prefix.startsWith("/skill") && (prefix.length === "/skill".length || prefix["/skill".length] === " ")) {
+        return skillCommandCompletions(prefix, skills);
+    }
+    if (prefix.startsWith("/secret") && (prefix.length === "/secret".length || prefix["/secret".length] === " ")) {
+        return secretCommandCompletions(prefix, secrets);
+    }
     if (prefix.length > 1 && !/^\/[\w-]*$/.test(prefix))
         return [];
     const normalizedPrefix = prefix.toLowerCase();
@@ -1826,6 +2353,137 @@ function slashCommandCompletions(text, cursor) {
         .flatMap((command) => [command.name, ...(command.aliases ?? [])].map((name) => ({ value: name, insertText: name, description: command.description, arguments: command.arguments, kind: "command" })))
         .filter((command) => command.value.toLowerCase().startsWith(normalizedPrefix));
 }
+function skillCommandCompletions(prefix, skills) {
+    const hasTrailingSpace = /\s$/.test(prefix);
+    const tokens = prefix.trim().split(/\s+/).filter(Boolean);
+    const argumentTokens = tokens.slice(1);
+    if (!hasTrailingSpace && argumentTokens.length === 0 && !"/skill".startsWith(prefix.toLowerCase()))
+        return [];
+    if (argumentTokens.length === 0)
+        return skillActionCompletions("");
+    const [first = "", second = ""] = argumentTokens;
+    if (first === "list" || first === "ls" || first === "import")
+        return [];
+    if (first === "delete" || first === "remove" || first === "rm") {
+        if (argumentTokens.length > 1 && hasTrailingSpace)
+            return [];
+        return skillNameCompletions(skills, hasTrailingSpace ? "" : second, "delete");
+    }
+    if (argumentTokens.length > 1 || hasTrailingSpace)
+        return [];
+    return skillActionCompletions(first);
+}
+function skillActionCompletions(current) {
+    return SKILL_COMMAND_ACTIONS
+        .flatMap((action) => [action.name, ...("aliases" in action ? action.aliases ?? [] : [])].map((name) => ({ name, description: action.description })))
+        .filter((action) => action.name.startsWith(current.toLowerCase()))
+        .map((action) => ({
+        value: action.name,
+        insertText: action.name === "list" || action.name === "ls" ? `/skill ${action.name}` : `/skill ${action.name} `,
+        description: action.description,
+        arguments: "optional",
+        kind: "skill-action",
+    }));
+}
+function skillNameCompletions(skills, current, action) {
+    return skills
+        .filter((skill) => skill.name.toLowerCase().includes(current.toLowerCase()))
+        .map((skill) => ({
+        value: skill.name,
+        insertText: action === "delete" ? `/skill delete ${skill.name}` : `/skill ${skill.name}`,
+        description: formatSkillCompletionDescription(skill),
+        arguments: "optional",
+        kind: "skill",
+    }));
+}
+function formatSkillCompletionDescription(skill) {
+    const tags = skill.tags?.length ? ` · ${skill.tags.join(",")}` : "";
+    return `${skill.description}${skill.execution ? ` · ${skill.execution}` : ""}${tags}`;
+}
+function secretCommandCompletions(prefix, secrets) {
+    const hasTrailingSpace = /\s$/.test(prefix);
+    const tokens = prefix.trim().split(/\s+/).filter(Boolean);
+    const argumentTokens = tokens.slice(1);
+    if (!hasTrailingSpace && argumentTokens.length === 0 && !"/secret".startsWith(prefix.toLowerCase()))
+        return [];
+    if (argumentTokens.length === 0)
+        return secretActionCompletions("");
+    const [action = "", key = "", newKey = ""] = argumentTokens;
+    const normalizedAction = secretCanonicalAction(action);
+    if (!normalizedAction) {
+        if (argumentTokens.length > 1 || hasTrailingSpace)
+            return [];
+        return secretActionCompletions(action);
+    }
+    if (normalizedAction === "list") {
+        if (argumentTokens.length === 1 && hasTrailingSpace)
+            return [{ value: "--show", insertText: "/secret list --show", description: "Print plaintext values in the REPL", arguments: "optional", kind: "secret-action" }];
+        if (argumentTokens.length === 2 && !hasTrailingSpace)
+            return "--show".startsWith(key) ? [{ value: "--show", insertText: "/secret list --show", description: "Print plaintext values in the REPL", arguments: "optional", kind: "secret-action" }] : [];
+        return [];
+    }
+    if (normalizedAction === "set" || normalizedAction === "request") {
+        if (argumentTokens.length <= 1 && hasTrailingSpace)
+            return [];
+        return [];
+    }
+    if (normalizedAction === "rename") {
+        if (argumentTokens.length <= 1)
+            return hasTrailingSpace ? secretKeyCompletions(secrets, "", normalizedAction) : [];
+        if (argumentTokens.length === 2 && !hasTrailingSpace)
+            return secretKeyCompletions(secrets, key, normalizedAction);
+        if (argumentTokens.length === 2 && hasTrailingSpace)
+            return [];
+        if (argumentTokens.length === 3 && !hasTrailingSpace && newKey)
+            return [];
+        return [];
+    }
+    if (normalizedAction === "get" || normalizedAction === "info" || normalizedAction === "delete") {
+        if (argumentTokens.length <= 1)
+            return hasTrailingSpace ? secretKeyCompletions(secrets, "", normalizedAction) : [];
+        if (argumentTokens.length === 2 && !hasTrailingSpace)
+            return secretKeyCompletions(secrets, key, normalizedAction);
+        return [];
+    }
+    return [];
+}
+function secretCanonicalAction(action) {
+    const lower = action.toLowerCase();
+    if (lower === "ls")
+        return "list";
+    if (lower === "show")
+        return "get";
+    if (lower === "empty")
+        return "request";
+    if (lower === "mv")
+        return "rename";
+    if (lower === "remove" || lower === "rm")
+        return "delete";
+    return ["list", "get", "set", "request", "info", "rename", "delete"].includes(lower) ? lower : undefined;
+}
+function secretActionCompletions(current) {
+    return SECRET_COMMAND_ACTIONS
+        .flatMap((action) => [action.name, ...("aliases" in action ? action.aliases ?? [] : [])].map((name) => ({ name, description: action.description })))
+        .filter((action) => action.name.startsWith(current.toLowerCase()))
+        .map((action) => ({
+        value: action.name,
+        insertText: `/secret ${action.name} `,
+        description: action.description,
+        arguments: "optional",
+        kind: "secret-action",
+    }));
+}
+function secretKeyCompletions(secrets, current, action) {
+    return secrets
+        .filter((secret) => secret.key.toLowerCase().includes(current.toLowerCase()))
+        .map((secret) => ({
+        value: secret.key,
+        insertText: `/secret ${action} ${secret.key}${action === "rename" ? " " : ""}`,
+        description: `${secret.status} · length=${secret.length}${secret.requestReason ? ` · ${secret.requestReason}` : ""}`,
+        arguments: "optional",
+        kind: "secret-key",
+    }));
+}
 function modelCommandCompletions(prefix) {
     const hasTrailingSpace = /\s$/.test(prefix);
     const tokens = prefix.trim().split(/\s+/).filter(Boolean);
@@ -1911,11 +2569,11 @@ function slashCompletionViewHeight(completions) {
         return 0;
     return Math.min(completions.length, SLASH_COMPLETION_PAGE_SIZE) + 2;
 }
-function slashCompletionSelectableCount(text, cursor) {
-    return slashCommandCompletions(text, cursor).length;
+function slashCompletionSelectableCount(text, cursor, skills = [], secrets = []) {
+    return slashCommandCompletions(text, cursor, skills, secrets).length;
 }
-function selectedSlashCommandCompletion(text, cursor, selectedIndex) {
-    const completions = slashCommandCompletions(text, cursor);
+function selectedSlashCommandCompletion(text, cursor, selectedIndex, skills = [], secrets = []) {
+    const completions = slashCommandCompletions(text, cursor, skills, secrets);
     if (completions.length === 0)
         return undefined;
     return completions[Math.max(0, Math.min(selectedIndex, completions.length - 1))];
@@ -1988,6 +2646,188 @@ function SlashCompletionLines({ completions, width, prompt, selectedIndex }) {
         e(Text, { key: "slash-completion-footer", color: "gray" }, fitToWidth(footer, contentWidth)),
     ].map((line, index) => e(Box, { key: `slash-completion-line-${index}`, height: 1, overflow: "hidden" }, e(Text, { color: "gray" }, " ".repeat(prompt.length)), line));
 }
+async function handleSecretCommand(command, runtime) {
+    const usage = "Usage: /secret <list|get|set|request|delete|rename|info> ...";
+    const action = command.action ?? "list";
+    const requireKey = () => {
+        if (!command.key)
+            throw new Error(usage);
+        return command.key;
+    };
+    if (action === "list") {
+        const entries = await runtime.secretStore.list();
+        if (entries.length === 0)
+            return systemLine("No secrets stored.");
+        const lines = await Promise.all(entries.map(async (entry) => {
+            if (command.show) {
+                const value = entry.status === "set" ? await runtime.secretStore.getPlaintext(entry.key) : "";
+                return `${entry.key} = ${value}`;
+            }
+            const reason = entry.requestReason ? ` reason=${JSON.stringify(entry.requestReason)}` : "";
+            return `${entry.key}\t${entry.status}\tlength=${entry.length}${reason}`;
+        }));
+        return systemLine(lines.join("\n"), EXPANDED_SUMMARY_MAX_LINES);
+    }
+    if (action === "get") {
+        const key = requireKey();
+        const info = await runtime.secretStore.info(key);
+        if (!info)
+            return systemLine(`Secret "${key}" does not exist.`);
+        const value = await runtime.secretStore.getPlaintext(key);
+        return systemLine(info.status === "empty" ? `Secret "${key}" is empty.` : value, EXPANDED_SUMMARY_MAX_LINES);
+    }
+    if (action === "set") {
+        const key = requireKey();
+        const meta = await runtime.secretStore.setPlaintext(key, command.value ?? "");
+        return systemLine(`Secret "${meta.key}" saved, status=${meta.status}, length=${meta.length}.`);
+    }
+    if (action === "request" || action === "empty") {
+        const key = requireKey();
+        const meta = await runtime.secretStore.requestEmpty(key, { reason: command.reason, requestedBy: "user" });
+        return systemLine(`Secret "${meta.key}" is ${meta.status}. Fill it with: /secret set ${meta.key} <value>`);
+    }
+    if (action === "delete") {
+        const key = requireKey();
+        const deleted = await runtime.secretStore.delete(key);
+        return systemLine(deleted ? `Secret "${key}" deleted.` : `Secret "${key}" did not exist.`);
+    }
+    if (action === "rename") {
+        const key = requireKey();
+        if (!command.newKey)
+            throw new Error("Usage: /secret rename <oldKey> <newKey>");
+        const meta = await runtime.secretStore.rename(key, command.newKey);
+        return systemLine(`Secret renamed to "${meta.key}".`);
+    }
+    if (action === "info") {
+        const key = requireKey();
+        const info = await runtime.secretStore.info(key);
+        return systemLine(info ? formatReplData(info, 4000) : `Secret "${key}" does not exist.`, EXPANDED_SUMMARY_MAX_LINES);
+    }
+    return systemLine(usage);
+}
+async function handleSkillCommand(command, runtime) {
+    if (command.action === "import")
+        return handleSkillImportCommand(command, runtime);
+    if (command.action === "delete")
+        return handleSkillDeleteCommand(command, runtime);
+    if (!command.name) {
+        const skills = await runtime.skills.list();
+        return systemLine(formatSkillList(skills), EXPANDED_SUMMARY_MAX_LINES);
+    }
+    const skill = await runtime.skills.get(command.name);
+    if (!skill)
+        return { kind: "error", text: `Unknown skill: ${command.name}\nUse /skill to list available skills.` };
+    return systemLine(formatSkillDetails(skill), EXPANDED_SUMMARY_MAX_LINES);
+}
+async function handleSkillImportCommand(command, runtime) {
+    if (!command.path)
+        return { kind: "error", text: "Usage: /skill import <path-to-skill-directory> [name]" };
+    const sourceDirectory = path.resolve(command.path);
+    const skillFile = path.join(sourceDirectory, "SKILL.md");
+    try {
+        const stat = await fs.stat(skillFile);
+        if (!stat.isFile())
+            return { kind: "error", text: `SKILL.md is not a file: ${skillFile}` };
+    }
+    catch (error) {
+        return { kind: "error", text: `Invalid skill path: ${skillFile}\n${error instanceof Error ? error.message : String(error)}` };
+    }
+    const name = requireSkillName(command.name ?? path.basename(sourceDirectory));
+    const linkPath = path.join(runtime.skillWorkspaceRoot, name);
+    const relativeTarget = path.relative(path.dirname(linkPath), sourceDirectory) || sourceDirectory;
+    try {
+        await fs.mkdir(runtime.skillWorkspaceRoot, { recursive: true });
+        const existing = await safeLstat(linkPath);
+        if (existing)
+            return { kind: "error", text: `Skill already exists at ${linkPath}. Delete it first with /skill delete ${name}.` };
+        await fs.symlink(relativeTarget, linkPath, "junction");
+        const imported = await runtime.skills.get(name);
+        return systemLine(`Imported skill ${name}\nLink: ${linkPath}\nTarget: ${sourceDirectory}${imported ? `\nDescription: ${imported.description}` : ""}`);
+    }
+    catch (error) {
+        return { kind: "error", text: `Failed to import skill ${name}: ${error instanceof Error ? error.message : String(error)}` };
+    }
+}
+async function handleSkillDeleteCommand(command, runtime) {
+    if (!command.name)
+        return { kind: "error", text: "Usage: /skill delete <name>" };
+    return handleSkillDeleteByName(command.name, runtime);
+}
+async function handleSkillDeleteByName(nameInput, runtime) {
+    const name = requireSkillName(nameInput);
+    const skillPath = path.join(runtime.skillWorkspaceRoot, name);
+    const existing = await safeLstat(skillPath);
+    if (!existing)
+        return { kind: "error", text: `No workspace skill named ${name} at ${skillPath}` };
+    try {
+        if (existing.isSymbolicLink())
+            await fs.unlink(skillPath);
+        else
+            await fs.rm(skillPath, { recursive: true, force: true });
+        return systemLine(`Deleted workspace skill ${name}: ${skillPath}`);
+    }
+    catch (error) {
+        return { kind: "error", text: `Failed to delete skill ${name}: ${error instanceof Error ? error.message : String(error)}` };
+    }
+}
+async function safeLstat(file) {
+    try {
+        return await fs.lstat(file);
+    }
+    catch {
+        return undefined;
+    }
+}
+function renderSkillInvocationPrompt(name, args) {
+    return `Use skill ${JSON.stringify(name)} with these arguments:\n${args}`;
+}
+function formatSkillList(skills) {
+    if (skills.length === 0) {
+        return [
+            "No skills found.",
+            "Skill roots:",
+            "  - .neo/skills/<name>/SKILL.md",
+            "  - ~/.neoctl/skills/<name>/SKILL.md",
+            "Create one with the skill_create tool or add a SKILL.md file.",
+        ].join("\n");
+    }
+    const width = Math.max(...skills.map((skill) => skill.name.length));
+    return [
+        "Available skills:",
+        ...skills.map((skill) => {
+            const tags = skill.tags?.length ? ` [${skill.tags.join(", ")}]` : "";
+            const execution = skill.execution ? ` (${skill.execution})` : "";
+            return `  ${skill.name.padEnd(width)}  ${skill.description}${execution}${tags}`;
+        }),
+        "",
+        "Usage:",
+        "  /skill <name>                 Show skill details",
+        "  /skill <name> <args>          Invoke skill with arguments",
+        "  /skill import <path> [name]   Import by linking a skill directory",
+        "  /skill delete <name>          Delete workspace skill link/directory",
+    ].join("\n");
+}
+function formatSkillDetails(skill) {
+    const lines = [
+        `Skill: ${skill.name}`,
+        skill.title ? `Title: ${skill.title}` : undefined,
+        `Description: ${skill.description}`,
+        `Execution: ${skill.execution}`,
+        skill.version ? `Version: ${skill.version}` : undefined,
+        skill.tags?.length ? `Tags: ${skill.tags.join(", ")}` : undefined,
+        skill.allowedTools?.length ? `Allowed tools: ${skill.allowedTools.join(", ")}` : undefined,
+        skill.model ? `Model: ${skill.model}` : undefined,
+        skill.effort ? `Effort: ${skill.effort}` : undefined,
+        skill.trustLevel ? `Trust: ${skill.trustLevel}` : undefined,
+        skill.source?.path ? `Path: ${skill.source.path}` : undefined,
+        "",
+        "Entrypoint:",
+        skill.entrypoint,
+        "",
+        `Invoke: /skill ${skill.name} <args>`,
+    ].filter((line) => line !== undefined);
+    return lines.join("\n");
+}
 async function handleModelCommand(command, runtime) {
     const current = runtime.engine.getModelSettings();
     const nextModel = command.model ?? current.model;
@@ -2069,10 +2909,6 @@ function currentModelProvider() {
 function modelEnvKeyForProvider(provider) {
     if (provider === "anthropic")
         return "ANTHROPIC_MODEL";
-    if (provider === "deepseek")
-        return "DEEPSEEK_MODEL";
-    if (provider === "kimi")
-        return "KIMI_MODEL";
     return "OPENAI_MODEL";
 }
 function envValueForReasoning(reasoning) {
@@ -2180,6 +3016,8 @@ function renderMessage(message, append, activeAssistantId, options = {}) {
             rendered = true;
         }
         if (block.type === "thinking") {
+            if (options.includeThinkingBlocks === false)
+                continue;
             append(thinkingLine(block.text));
             rendered = true;
         }
@@ -2323,7 +3161,25 @@ async function handleSessionsCommand(runtime, runningSessionIds, setBrowser, app
         append(systemLine("No saved sessions found."));
         return;
     }
-    setBrowser({ sessions, runningSessionIds, pageSize: SESSIONS_DEFAULT_PAGE_SIZE, pageIndex: 0, selectedIndex: 0 });
+    setBrowser({ items: sessions, sessions, runningSessionIds, pageSize: SESSIONS_DEFAULT_PAGE_SIZE, pageIndex: 0, selectedIndex: 0 });
+}
+async function handleSkillsCommand(runtime, setBrowser, append) {
+    const skills = await runtime.skills.list();
+    if (skills.length === 0) {
+        setBrowser(undefined);
+        append(systemLine(formatSkillList(skills), EXPANDED_SUMMARY_MAX_LINES));
+        return;
+    }
+    setBrowser({ items: skills, skills, pageSize: SESSIONS_DEFAULT_PAGE_SIZE, pageIndex: 0, selectedIndex: 0 });
+}
+async function handleSecretsCommand(runtime, setBrowser, append) {
+    const secrets = await runtime.secretStore.list();
+    if (secrets.length === 0) {
+        setBrowser(undefined);
+        append(systemLine("No secrets stored. Press /secret set <key> <value> to add one, or /secret request <key> to create an empty placeholder."));
+        return;
+    }
+    setBrowser({ items: secrets, secrets, pageSize: SESSIONS_DEFAULT_PAGE_SIZE, pageIndex: 0, selectedIndex: 0 });
 }
 async function handleExportCommand(command, runtime) {
     const snapshot = runtime.engine.snapshot();
@@ -2371,6 +3227,7 @@ async function handleDeleteSessionCommand(sessionId, current, runtime, setBrowse
             const pageLength = nextSessions.slice(pageIndex * current.pageSize, pageIndex * current.pageSize + current.pageSize).length;
             setBrowser({
                 ...current,
+                items: nextSessions,
                 sessions: nextSessions,
                 runningSessionIds: current.runningSessionIds.filter((id) => id !== sessionId),
                 pageIndex,
@@ -2408,11 +3265,11 @@ function restoredHistoryLines(runtime) {
         return lines.length;
     };
     for (const message of runtime.engine.getHistoryMessages()) {
-        renderMessage(message, append, undefined, { includeToolUseBlocks: true });
+        renderMessage(message, append, undefined, { includeToolUseBlocks: true, includeThinkingBlocks: false });
     }
     return lines;
 }
-const LOGIN_PROVIDERS = ["openai", "anthropic", "deepseek", "kimi"];
+const LOGIN_PROVIDERS = ["openai", "anthropic"];
 const SHARED_LOGIN_FIELDS = [
     { key: "reasoningEffort", label: "Reasoning effort", envKey: "MODEL_REASONING_EFFORT", scope: "shared", options: ["", "off", "none", "minimal", "low", "medium", "high", "xhigh", "max"] },
     { key: "reasoningSummary", label: "Reasoning summary", envKey: "MODEL_REASONING_SUMMARY", scope: "shared", options: ["", "auto", "concise", "detailed"] },
@@ -2438,20 +3295,6 @@ const LOGIN_FIELD_DEFINITIONS = {
         { key: "version", label: "Anthropic version", envKey: "ANTHROPIC_VERSION", scope: "provider", placeholder: "2023-06-01" },
         ...SHARED_LOGIN_FIELDS,
     ],
-    deepseek: [
-        { key: "apiKey", label: "API key", envKey: "DEEPSEEK_API_KEY", scope: "provider", required: true, secret: true, placeholder: "sk-..." },
-        { key: "baseUrl", label: "Base URL", envKey: "DEEPSEEK_BASE_URL", scope: "provider", placeholder: "https://api.deepseek.com" },
-        { key: "model", label: "Model", envKey: "DEEPSEEK_MODEL", scope: "provider", required: true, placeholder: "deepseek-chat" },
-        { key: "fallbackModel", label: "Fallback model", envKey: "DEEPSEEK_FALLBACK_MODEL", scope: "provider" },
-        ...SHARED_LOGIN_FIELDS,
-    ],
-    kimi: [
-        { key: "apiKey", label: "API key", envKey: "KIMI_API_KEY", scope: "provider", required: true, secret: true, placeholder: "sk-..." },
-        { key: "baseUrl", label: "Base URL", envKey: "KIMI_BASE_URL", scope: "provider", placeholder: "https://api.moonshot.cn/v1" },
-        { key: "model", label: "Model", envKey: "KIMI_MODEL", scope: "provider", required: true, placeholder: "kimi-k2.6" },
-        { key: "fallbackModel", label: "Fallback model", envKey: "KIMI_FALLBACK_MODEL", scope: "provider" },
-        ...SHARED_LOGIN_FIELDS,
-    ],
 };
 const DEPRECATED_MODEL_ENV_KEYS = [
     "MODEL_API_KEY",
@@ -2472,55 +3315,55 @@ const DEPRECATED_MODEL_ENV_KEYS = [
     "ANTHROPIC_TIMEOUT_MS",
     "ANTHROPIC_STREAM_IDLE_TIMEOUT_MS",
     "ANTHROPIC_MAX_RETRIES",
-    "DEEPSEEK_REASONING_EFFORT",
-    "DEEPSEEK_REASONING_SUMMARY",
-    "DEEPSEEK_MAX_OUTPUT_TOKENS",
-    "DEEPSEEK_TIMEOUT_MS",
-    "DEEPSEEK_STREAM_IDLE_TIMEOUT_MS",
-    "DEEPSEEK_MAX_RETRIES",
-    "KIMI_REASONING_EFFORT",
-    "KIMI_REASONING_SUMMARY",
-    "KIMI_MAX_OUTPUT_TOKENS",
-    "KIMI_TIMEOUT_MS",
-    "KIMI_STREAM_IDLE_TIMEOUT_MS",
-    "KIMI_MAX_RETRIES",
-    "MOONSHOT_REASONING_EFFORT",
-    "MOONSHOT_REASONING_SUMMARY",
-    "MOONSHOT_MAX_OUTPUT_TOKENS",
-    "MOONSHOT_TIMEOUT_MS",
-    "MOONSHOT_STREAM_IDLE_TIMEOUT_MS",
-    "MOONSHOT_MAX_RETRIES",
 ];
-function sessionsPageCount(state) {
-    return Math.max(1, Math.ceil(state.sessions.length / state.pageSize));
+function pagedPageCount(state) {
+    return Math.max(1, Math.ceil(state.items.length / state.pageSize));
 }
-function sessionsPageItems(state) {
+function pagedPageItems(state) {
     const start = state.pageIndex * state.pageSize;
-    return state.sessions.slice(start, start + state.pageSize);
+    return state.items.slice(start, start + state.pageSize);
 }
-function sessionAbsoluteIndex(state) {
+function pagedAbsoluteIndex(state) {
     return state.pageIndex * state.pageSize + state.selectedIndex;
 }
-function moveSessionsSelection(state, delta) {
-    const pageLength = sessionsPageItems(state).length;
+function movePagedSelection(state, delta) {
+    const pageLength = pagedPageItems(state).length;
     if (pageLength <= 0)
         return state;
     const selectedIndex = (state.selectedIndex + delta + pageLength) % pageLength;
     return { ...state, selectedIndex };
 }
-function moveSessionsPage(state, delta) {
-    const pageCount = sessionsPageCount(state);
+function movePagedPage(state, delta) {
+    const pageCount = pagedPageCount(state);
     if (pageCount <= 1)
         return state;
     const pageIndex = (state.pageIndex + delta + pageCount) % pageCount;
-    const pageLength = state.sessions.slice(pageIndex * state.pageSize, pageIndex * state.pageSize + state.pageSize).length;
+    const pageLength = state.items.slice(pageIndex * state.pageSize, pageIndex * state.pageSize + state.pageSize).length;
     return { ...state, pageIndex, selectedIndex: Math.min(state.selectedIndex, Math.max(0, pageLength - 1)) };
 }
+function sessionsPageItems(state) {
+    return pagedPageItems(state);
+}
+function sessionAbsoluteIndex(state) {
+    return pagedAbsoluteIndex(state);
+}
+function moveSessionsSelection(state, delta) {
+    return movePagedSelection(state, delta);
+}
+function moveSessionsPage(state, delta) {
+    return movePagedPage(state, delta);
+}
 function sessionsBrowserViewHeight(state) {
     return sessionsPageItems(state).length + 3;
 }
+function skillsBrowserViewHeight(state) {
+    return pagedPageItems(state).length + 3;
+}
+function secretsBrowserViewHeight(state) {
+    return pagedPageItems(state).length + 3;
+}
 function SessionsBrowser({ state, width }) {
-    const pageCount = sessionsPageCount(state);
+    const pageCount = pagedPageCount(state);
     const pageItems = sessionsPageItems(state);
     const showPagination = pageCount > 1;
     const contentWidth = Math.max(20, width);
@@ -2540,6 +3383,51 @@ function SessionsBrowser({ state, width }) {
         }, row.numberPrefix), row.rest);
     }), e(Text, { color: "gray" }, fitToWidth(footer, contentWidth)));
 }
+function SkillsBrowser({ state, width }) {
+    const pageCount = pagedPageCount(state);
+    const pageItems = pagedPageItems(state);
+    const showPagination = pageCount > 1;
+    const contentWidth = Math.max(20, width);
+    const header = showPagination
+        ? `Skills (${state.skills.length}) · page ${state.pageIndex + 1}/${pageCount}`
+        : `Skills (${state.skills.length})`;
+    const footer = showPagination
+        ? "↑/↓ select · ←/→ page · Enter details · i invoke · a import · d/Delete remove · Esc close"
+        : "↑/↓ select · Enter details · i invoke · a import · d/Delete remove · Esc close";
+    const nameWidth = Math.min(28, Math.max(...pageItems.map((skill) => skill.name.length)));
+    return e(Box, { flexDirection: "column", marginTop: 1 }, e(Text, { color: "cyan", bold: true }, fitToWidth(header, contentWidth)), ...pageItems.map((skill, index) => {
+        const selected = index === state.selectedIndex;
+        const absoluteIndex = state.pageIndex * state.pageSize + index;
+        const prefix = `${absoluteIndex + 1}.`.padStart(String(state.skills.length).length + 1);
+        const tags = skill.tags?.length ? ` [${skill.tags.join(",")}]` : "";
+        const execution = skill.execution ? ` (${skill.execution})` : "";
+        const restWidth = Math.max(0, contentWidth - prefix.length - nameWidth - 4);
+        const rest = fitToWidth(`${skill.description}${execution}${tags}`, restWidth);
+        return e(Text, { key: skill.name, color: "white" }, e(Text, { color: selected ? "black" : "white", backgroundColor: selected ? "cyan" : undefined }, prefix), e(Text, { color: "gray" }, " "), e(Text, { color: "cyan" }, fitToWidth(skill.name, nameWidth).padEnd(nameWidth)), e(Text, { color: "gray" }, "  "), e(Text, { color: selected ? "white" : "gray" }, rest));
+    }), e(Text, { color: "gray" }, fitToWidth(footer, contentWidth)));
+}
+function SecretsBrowser({ state, width }) {
+    const pageCount = pagedPageCount(state);
+    const pageItems = pagedPageItems(state);
+    const showPagination = pageCount > 1;
+    const contentWidth = Math.max(20, width);
+    const header = showPagination
+        ? `Secrets (${state.secrets.length}) · page ${state.pageIndex + 1}/${pageCount}`
+        : `Secrets (${state.secrets.length})`;
+    const footer = showPagination
+        ? "↑/↓ select · ←/→ page · Enter info · s set · r rename · a add · e empty · d/Delete remove · Esc close"
+        : "↑/↓ select · Enter info · s set · r rename · a add · e empty · d/Delete remove · Esc close";
+    const keyWidth = Math.min(32, Math.max(...pageItems.map((secret) => secret.key.length)));
+    return e(Box, { flexDirection: "column", marginTop: 1 }, e(Text, { color: "cyan", bold: true }, fitToWidth(header, contentWidth)), ...pageItems.map((secret, index) => {
+        const selected = index === state.selectedIndex;
+        const absoluteIndex = state.pageIndex * state.pageSize + index;
+        const prefix = `${absoluteIndex + 1}.`.padStart(String(state.secrets.length).length + 1);
+        const reason = secret.requestReason ? ` reason=${JSON.stringify(secret.requestReason)}` : "";
+        const restWidth = Math.max(0, contentWidth - prefix.length - keyWidth - 4);
+        const rest = fitToWidth(`${secret.status} · length=${secret.length}${reason}`, restWidth);
+        return e(Text, { key: secret.key, color: "white" }, e(Text, { color: selected ? "black" : "white", backgroundColor: selected ? "cyan" : undefined }, prefix), e(Text, { color: "gray" }, " "), e(Text, { color: secret.status === "set" ? "green" : "yellow" }, fitToWidth(secret.key, keyWidth).padEnd(keyWidth)), e(Text, { color: "gray" }, "  "), e(Text, { color: selected ? "white" : "gray" }, rest));
+    }), e(Text, { color: "gray" }, fitToWidth(footer, contentWidth)));
+}
 function handleLoginFormInput(value, key, state, setLoginFormState, runtime, append, setStatus) {
     if (key.escape) {
         if (state.step === "fields")
@@ -2708,12 +3596,6 @@ function loginValuesForProvider(provider, env) {
     for (const field of LOGIN_FIELD_DEFINITIONS[provider]) {
         values[field.key] = env[field.envKey] ?? "";
     }
-    if (provider === "kimi") {
-        values.apiKey ||= env.MOONSHOT_API_KEY ?? process.env.MOONSHOT_API_KEY ?? "";
-        values.baseUrl ||= env.MOONSHOT_BASE_URL ?? process.env.MOONSHOT_BASE_URL ?? "";
-        values.model ||= env.MOONSHOT_MODEL ?? process.env.MOONSHOT_MODEL ?? "";
-        values.fallbackModel ||= env.MOONSHOT_FALLBACK_MODEL ?? process.env.MOONSHOT_FALLBACK_MODEL ?? "";
-    }
     if (!values.baseUrl)
         values.baseUrl = defaultBaseUrlForLoginProvider(provider);
     if (!values.model)
@@ -2723,15 +3605,11 @@ function loginValuesForProvider(provider, env) {
     return values;
 }
 function parseLoginProvider(value) {
-    if (value === "openai" || value === "anthropic" || value === "deepseek" || value === "kimi")
+    if (value === "openai" || value === "anthropic")
         return value;
     return undefined;
 }
 function guessLoginProvider(env) {
-    if (env.KIMI_API_KEY ?? env.MOONSHOT_API_KEY ?? process.env.KIMI_API_KEY ?? process.env.MOONSHOT_API_KEY)
-        return "kimi";
-    if (env.DEEPSEEK_API_KEY ?? process.env.DEEPSEEK_API_KEY)
-        return "deepseek";
     if (env.ANTHROPIC_API_KEY ?? process.env.ANTHROPIC_API_KEY)
         return "anthropic";
     return "openai";
@@ -2739,19 +3617,11 @@ function guessLoginProvider(env) {
 function defaultBaseUrlForLoginProvider(provider) {
     if (provider === "anthropic")
         return "https://api.anthropic.com";
-    if (provider === "deepseek")
-        return "https://api.deepseek.com";
-    if (provider === "kimi")
-        return "https://api.moonshot.cn/v1";
     return "https://api.openai.com";
 }
 function defaultModelForLoginProvider(provider) {
     if (provider === "anthropic")
         return "claude-sonnet-4-6";
-    if (provider === "deepseek")
-        return "deepseek-chat";
-    if (provider === "kimi")
-        return "kimi-k2.6";
     return "gpt-5.5";
 }
 function loginFormViewHeight(state) {
@@ -2770,7 +3640,7 @@ function LoginFormView({ state, width }) {
         const visibleValue = formatLoginFieldValue(field, rawValue, selected ? state.cursor : undefined);
         const placeholder = rawValue ? "" : (field.placeholder ? ` (${field.placeholder})` : "");
         return e(Text, { key: field.key, color: "white" }, e(Text, { color: selected ? "black" : "white", backgroundColor: selected ? "cyan" : undefined }, `${index + 1}.`.padStart(3)), e(Text, { color: field.required ? "yellow" : "gray" }, ` ${field.label.padEnd(maxLabel)} `), e(Text, { color: field.scope === "shared" ? "blue" : "gray" }, field.scope === "shared" ? "shared " : "provider "), e(Text, { color: rawValue ? "white" : "gray" }, fitToWidth(`${visibleValue}${placeholder}`, Math.max(8, contentWidth - maxLabel - 14))));
-    }), e(Text, { color: "gray" }, fitToWidth("↑/↓ field · ←/→ cursor · type edit · Tab cycle choices · Enter save · Esc back/cancel", contentWidth)), e(Text, { color: "gray" }, fitToWidth("Provider fields save as OPENAI_* / ANTHROPIC_* / DEEPSEEK_* / KIMI_*; shared runtime fields save as MODEL_*.", contentWidth)));
+    }), e(Text, { color: "gray" }, fitToWidth("↑/↓ field · ←/→ cursor · type edit · Tab cycle choices · Enter save · Esc back/cancel", contentWidth)), e(Text, { color: "gray" }, fitToWidth("Provider fields save as OPENAI_* / ANTHROPIC_*; shared runtime fields save as MODEL_*.", contentWidth)));
 }
 function formatLoginFieldValue(field, value, cursor) {
     const display = field.secret && value ? "•".repeat(Math.min(value.length, 24)) : value;
@@ -2796,12 +3666,6 @@ function envEntriesForLoginForm(state) {
         const value = (state.values[field.key] ?? "").trim();
         entries[field.envKey] = value || undefined;
     }
-    if (state.provider === "kimi") {
-        entries.MOONSHOT_API_KEY = undefined;
-        entries.MOONSHOT_BASE_URL = undefined;
-        entries.MOONSHOT_MODEL = undefined;
-        entries.MOONSHOT_FALLBACK_MODEL = undefined;
-    }
     return entries;
 }
 function updateEnvContent(content, updates, removeKeys = []) {
@@ -2829,8 +3693,6 @@ function updateEnvContent(content, updates, removeKeys = []) {
         appendEnvGroup(updatedLines, "# Neo active provider", grouped.active);
         appendEnvGroup(updatedLines, "# OpenAI provider settings", grouped.openai);
         appendEnvGroup(updatedLines, "# Anthropic provider settings", grouped.anthropic);
-        appendEnvGroup(updatedLines, "# DeepSeek provider settings", grouped.deepseek);
-        appendEnvGroup(updatedLines, "# Kimi provider settings", grouped.kimi);
         appendEnvGroup(updatedLines, "# Shared model runtime settings", grouped.shared);
     }
     return `${updatedLines.join("\n").replace(/\n*$/u, "")}\n`;
@@ -2840,8 +3702,6 @@ function groupLoginEnvEntries(entries) {
         active: entries.filter(([key]) => key === "MODEL_PROVIDER"),
         openai: entries.filter(([key]) => key.startsWith("OPENAI_")),
         anthropic: entries.filter(([key]) => key.startsWith("ANTHROPIC_")),
-        deepseek: entries.filter(([key]) => key.startsWith("DEEPSEEK_")),
-        kimi: entries.filter(([key]) => key.startsWith("KIMI_") || key.startsWith("MOONSHOT_")),
         shared: entries.filter(([key]) => key.startsWith("MODEL_") && key !== "MODEL_PROVIDER"),
     };
 }
@@ -3034,9 +3894,11 @@ function formatToolUse(toolUse) {
             text: formatPlanToolPayload(toolUse.input),
         };
     }
+    const description = toolUse.name === "exec" ? execDescriptionFromInput(toolUse.input) : undefined;
     return {
         kind: "tool",
         title: toolTitle(toolUse.name, "running"),
+        bodyTitle: description,
         text: formatJson(toolUse.input, 1200),
         previewStyle: "summary",
     };
@@ -3063,9 +3925,11 @@ function formatToolResultLine(toolName, output, ok) {
 }
 function formatToolFinishedWithoutResult(toolUse, ok) {
     const inputText = formatJson(toolUse.input, 1200);
+    const description = toolUse.name === "exec" ? execDescriptionFromInput(toolUse.input) : undefined;
     return {
         kind: ok ? "tool" : "error",
         title: toolTitle(toolUse.name, "finished"),
+        bodyTitle: description,
         titleStatus: ok ? "success" : "failure",
         text: inputText ? `${ok ? "finished" : "failed"}\n${inputText}` : ok ? "finished" : "failed",
         previewStyle: "summary",
@@ -3078,15 +3942,27 @@ function toolTitle(toolName, phase) {
         return `${phase === "running" ? "◇" : "◆"} plan`;
     return `${phase === "running" ? "◇" : "◆"} ${toolName}`;
 }
+function execDescriptionFromInput(input) {
+    if (!isRecord(input))
+        return undefined;
+    const description = typeof input.description === "string" ? input.description.trim() : "";
+    return description || undefined;
+}
 function isPlanToolPayload(value) {
     if (!isRecord(value) || !Array.isArray(value.items))
         return false;
-    return value.items.every((item) => {
-        if (!isRecord(item))
-            return false;
-        return (typeof item.description === "string" &&
-            (item.status === "pending" || item.status === "in_progress" || item.status === "completed"));
-    });
+    return value.items.every(isPlanItemLike);
+}
+function isPlanItemLike(item) {
+    if (!isRecord(item))
+        return false;
+    if (typeof item.description !== "string")
+        return false;
+    if (item.status !== "pending" && item.status !== "in_progress" && item.status !== "completed")
+        return false;
+    if (item.subitems === undefined)
+        return true;
+    return Array.isArray(item.subitems) && item.subitems.every(isPlanItemLike);
 }
 function planToolBodyTitle(payload) {
     const title = payload.title?.trim();
@@ -3098,16 +3974,25 @@ function formatPlanToolPayload(payload) {
         sections.push(payload.summary.trim());
     if (payload.note?.trim())
         sections.push(payload.note.trim());
-    sections.push(payload.items.map(formatPlanItem).join("\n"));
+    sections.push(payload.items.flatMap((item) => formatPlanItem(item)).join("\n"));
     return sections.filter(Boolean).join("\n");
 }
-function formatPlanItem(item) {
+function formatPlanItem(item, depth = 0) {
+    const indent = "  ".repeat(Math.max(0, depth));
     const text = escapePlanMarkdown(item.description.trim());
-    if (item.status === "completed")
-        return `- ~~${text}~~`;
-    if (item.status === "in_progress")
-        return `- ▶ ${text}`;
-    return `- ${text}`;
+    const marker = planItemMarker(item.status);
+    const line = item.status === "completed"
+        ? `${indent}- ${marker} ~~${text}~~`
+        : `${indent}- ${marker} ${text}`;
+    const subitems = item.subitems?.flatMap((subitem) => formatPlanItem(subitem, depth + 1)) ?? [];
+    return [line, ...subitems];
+}
+function planItemMarker(status) {
+    if (status === "completed")
+        return "✓";
+    if (status === "in_progress")
+        return "▶";
+    return "○";
 }
 function escapePlanMarkdown(text) {
     return text.replace(/([\\`*_{}[\]()#+.!|>~-])/g, "\\$1");
@@ -3301,8 +4186,10 @@ function formatExecToolResult(output, ok) {
         : output.exitCode === 0
             ? "exit 0"
             : `exit ${output.exitCode ?? output.signal ?? "unknown"}`;
+    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}`,
@@ -3783,6 +4670,8 @@ const TERMINAL_TITLE_WORKING_PREFIX = "● ";
 const TERMINAL_TITLE_READY_PREFIX = "✓ ";
 const REPL_ANIMATION_INTERVAL_MS = 420;
 const TOOL_RESULT_REPLACEMENT_DELAY_MS = 2000;
+const SUBAGENT_ACTIVITY_UPDATE_DEBOUNCE_MS = 180;
+const SUBAGENT_COMPLETED_LINGER_MS = 8000;
 const TOKEN_PULSE_MS = 900;
 const ANIMATED_NUMBER_INTERVAL_MS = 50;
 const ANIMATED_NUMBER_MIN_DURATION_MS = 180;
@@ -3795,6 +4684,8 @@ const STATUS_SHIMMER_RADIUS = 1;
 const STATUS_SHIMMER_COLOR = "whiteBright";
 const STATUS_SEPARATOR = " · ";
 const STATUS_BAR_RENDER_ROWS = 2;
+const FOREGROUND_EXEC_DETACH_HINT_RENDER_ROWS = 1;
+const FOREGROUND_EXEC_DETACH_HINT_DELAY_MS = 2000;
 const BACKGROUND_TASK_STATUS_RENDER_ROWS = 1;
 const QUEUED_INPUT_RENDER_ROWS = 1;
 const EMPTY_CTRL_C_EXIT_PLACEHOLDER = "Press Ctrl+C again to exit";