@hunterzhu/pulse-cli 0.1.6 → 0.1.7

package/dist/config.js

@@ -2,8 +2,16 @@ import { access, chmod, mkdir, readFile, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 export const defaultPulseConfig = {
-    provider: { provider: 'mock', model: 'mock', apiKeyEnv: 'OPENAI_API_KEY' },
+    providers: {
+        mock: { provider: 'mock', name: 'Mock' },
+    },
+    models: {
+        mock: { displayName: 'mock', provider: 'mock', modelCode: 'mock', maxContextTokens: 32_000, maxOutputTokens: 4_096, reasoningEffort: 'medium' },
+    },
+    activeModel: 'mock',
     approvalMode: 'ask',
+    maxTurns: 32,
+    autoCompactPercent: 90,
     allowNetwork: false,
 };
 export function defaultPulseConfigPath() {
@@ -43,16 +51,34 @@ function asConfig(value) {
         return undefined;
     return value;
 }
-/** Workspace files must not escalate approval, network, or provider credentials. */
+/** Workspace files must not escalate approval, network, provider credentials, or the system prompt. */
 export function sanitizeWorkspaceConfig(value) {
-    const provider = value.provider === undefined ? undefined : {
-        ...(value.provider.provider === undefined ? {} : { provider: value.provider.provider }),
-        ...(value.provider.model === undefined ? {} : { model: value.provider.model }),
-    };
+    const providers = value.providers === undefined ? undefined : Object.fromEntries(Object.entries(value.providers).flatMap(([name, profile]) => {
+        const safe = {
+            provider: profile.provider,
+            ...(profile.name === undefined ? {} : { name: profile.name }),
+        };
+        return Object.keys(safe).length ? [[name, safe]] : [];
+    }));
     return {
         ...(value.cwd === undefined ? {} : { cwd: value.cwd }),
         ...(value.dataDir === undefined ? {} : { dataDir: value.dataDir }),
-        ...(provider === undefined || Object.keys(provider).length === 0 ? {} : { provider }),
+        ...(providers === undefined || Object.keys(providers).length === 0 ? {} : { providers }),
+        ...(value.activeModel === undefined ? {} : { activeModel: value.activeModel }),
+        ...(value.models === undefined ? {} : {
+            models: Object.fromEntries(Object.entries(value.models).flatMap(([name, model]) => {
+                if (!model.provider || !model.modelCode)
+                    return [];
+                return [[name, {
+                            provider: model.provider,
+                            modelCode: model.modelCode,
+                            displayName: model.displayName,
+                            ...(model.maxContextTokens === undefined ? {} : { maxContextTokens: model.maxContextTokens }),
+                            ...(model.maxOutputTokens === undefined ? {} : { maxOutputTokens: model.maxOutputTokens }),
+                            ...(model.reasoningEffort === undefined ? {} : { reasoningEffort: model.reasoningEffort }),
+                        }]];
+            })),
+        }),
     };
 }
 export function mergePulseConfigs(layers) {
@@ -62,7 +88,8 @@ export function mergePulseConfigs(layers) {
         merged = {
             ...merged,
             ...value,
-            ...(merged.provider === undefined && value.provider === undefined ? {} : { provider: { ...merged.provider, ...value.provider } }),
+            ...(merged.providers === undefined && value.providers === undefined ? {} : { providers: { ...merged.providers, ...value.providers } }),
+            ...(merged.models === undefined && value.models === undefined ? {} : { models: { ...merged.models, ...value.models } }),
         };
     }
     return merged;

package/dist/hooks/useConversation.d.ts

@@ -11,5 +11,6 @@ export declare function useConversation({ host, conversationId, }: {
     addAssistantMessage: (msg: DisplayMessage) => void;
     clearMessages: () => void;
     switchConversation: (id: string) => Promise<void>;
-    newConversation: () => Promise<void>;
+    newConversation: () => Promise<ConversationHandle | null>;
+    createConversation: () => Promise<ConversationHandle | null>;
 };

package/dist/hooks/useConversation.js

@@ -36,9 +36,10 @@ export function useConversation({ host, conversationId, }) {
                     }
                 }
                 else {
-                    const conv = await currentHost.createConversation();
-                    if (mounted && conv) {
-                        setConversation(conv);
+                    // An interactive window starts without a persisted session. The
+                    // first user message (or an explicit /new) creates one.
+                    if (mounted) {
+                        setConversation(null);
                         setMessages([]);
                     }
                 }
@@ -89,19 +90,24 @@ export function useConversation({ host, conversationId, }) {
             setError(err instanceof Error ? err.message : String(err));
         }
     }, [host, loadMessages]);
-    const newConversation = useCallback(async () => {
+    const createConversation = useCallback(async () => {
         if (!host)
-            return;
+            return null;
         try {
             const conv = await host.createConversation();
             setConversation(conv);
             setMessages([]);
             setError(null);
+            return conv;
         }
         catch (err) {
             setError(err instanceof Error ? err.message : String(err));
+            return null;
         }
     }, [host]);
+    const newConversation = useCallback(async () => {
+        return createConversation();
+    }, [createConversation]);
     return {
         conversation,
         messages,
@@ -111,5 +117,6 @@ export function useConversation({ host, conversationId, }) {
         clearMessages,
         switchConversation,
         newConversation,
+        createConversation,
     };
 }

package/dist/hooks/useRun.d.ts

@@ -1,5 +1,5 @@
 import type { LocalHost } from '@hunterzhu/pulse-server';
-import type { ApprovalRequest, DisplayMessage } from '../types.js';
+import type { ApprovalRequest, AskRequest, DisplayMessage, LaneDisplay } from '../types.js';
 export declare function describeFactStatus(data: unknown): string;
 export declare function useRun({ host, conversationId, addAssistantMessage, }: {
     host: LocalHost | null;
@@ -10,8 +10,12 @@ export declare function useRun({ host, conversationId, addAssistantMessage, }: {
     currentStep: string | null;
     error: string | null;
     approvalRequest: ApprovalRequest | null;
-    sendMessage: (text: string) => Promise<void>;
-    resumeActive: () => Promise<void>;
+    askRequest: AskRequest | null;
+    lanes: LaneDisplay[];
+    approvalSubmitting: boolean;
+    sendMessage: (text: string, targetConversationId?: string) => Promise<void>;
+    resumeActive: (targetConversationId?: string) => Promise<void>;
     approveAction: (effectId: string, approved: boolean, reason?: string) => Promise<void>;
+    replyAsk: (effectId: string, value: Record<string, unknown>) => Promise<void>;
     cancelRun: () => Promise<void>;
 };

package/dist/hooks/useRun.js

@@ -1,6 +1,6 @@
 import { useState, useRef, useCallback, useEffect } from 'react';
 function toolStatus(value) {
-    if (value === 'succeeded' || value === 'failed' || value === 'running')
+    if (value === 'succeeded' || value === 'failed' || value === 'running' || value === 'cancelled')
         return value;
     return 'running';
 }
@@ -40,6 +40,9 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
     const [currentStep, setCurrentStep] = useState(null);
     const [error, setError] = useState(null);
     const [approvalRequest, setApprovalRequest] = useState(null);
+    const [askRequest, setAskRequest] = useState(null);
+    const [approvalSubmitting, setApprovalSubmitting] = useState(false);
+    const [lanes, setLanes] = useState([]);
     const runRef = useRef(null);
     const consumeRun = useCallback(async (run) => {
         runRef.current = run;
@@ -51,8 +54,30 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
             toolCalls: [],
             runId: run.id,
         };
-        addAssistantMessage({ ...assistantMessage, toolCalls: [] });
+        let assistantStarted = false;
+        const ensureAssistant = () => {
+            if (assistantStarted)
+                return;
+            assistantStarted = true;
+            addAssistantMessage({ ...assistantMessage, toolCalls: [] });
+        };
         for await (const event of run.events) {
+            if (event.type === 'notice') {
+                const data = event.data && typeof event.data === 'object' && !Array.isArray(event.data)
+                    ? event.data
+                    : {};
+                const text = typeof data.text === 'string' ? data.text : '';
+                if (text) {
+                    addAssistantMessage({
+                        id: `notice-${run.id}-${event.seq}`,
+                        role: 'system',
+                        text,
+                        createdAt: new Date().toISOString(),
+                    });
+                }
+                continue;
+            }
+            ensureAssistant();
             switch (event.type) {
                 case 'text':
                     assistantMessage.text += String(event.data ?? '');
@@ -88,6 +113,31 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
                     const input = payload.input && typeof payload.input === 'object' && !Array.isArray(payload.input)
                         ? payload.input
                         : {};
+                    if (input.kind === 'ask' && (input.type === 'choice' || input.type === 'multi' || input.type === 'input')) {
+                        const options = Array.isArray(input.options)
+                            ? input.options.flatMap((option) => {
+                                if (!option || typeof option !== 'object' || Array.isArray(option))
+                                    return [];
+                                const item = option;
+                                return typeof item.label === 'string' && typeof item.value === 'string' ? [{ label: item.label, value: item.value }] : [];
+                            })
+                            : undefined;
+                        setApprovalRequest(null);
+                        setAskRequest({
+                            effectId,
+                            toolName: typeof input.toolName === 'string' ? input.toolName : `ask.${input.type}`,
+                            type: input.type,
+                            prompt: typeof input.prompt === 'string' ? input.prompt : '请输入你的回答。',
+                            ...(options && options.length ? { options } : {}),
+                            ...(typeof input.min === 'number' ? { min: input.min } : {}),
+                            ...(typeof input.max === 'number' ? { max: input.max } : {}),
+                            ...(typeof input.placeholder === 'string' ? { placeholder: input.placeholder } : {}),
+                            ...(typeof input.defaultValue === 'string' ? { defaultValue: input.defaultValue } : {}),
+                        });
+                        setCurrentStep('等待你的回答...');
+                        break;
+                    }
+                    setAskRequest(null);
                     const tools = Array.isArray(input.tools)
                         ? input.tools.flatMap((tool) => {
                             if (!tool || typeof tool !== 'object' || Array.isArray(tool))
@@ -115,6 +165,25 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
                     break;
                 }
                 case 'fact':
+                    if (event.data && typeof event.data === 'object' && !Array.isArray(event.data)) {
+                        const fact = event.data;
+                        if (fact.type === 'lane.snapshot' && Array.isArray(fact.lanes)) {
+                            setLanes(fact.lanes.flatMap((lane) => {
+                                if (!lane || typeof lane !== 'object' || Array.isArray(lane))
+                                    return [];
+                                const item = lane;
+                                if (typeof item.id !== 'string' || typeof item.status !== 'string' || typeof item.goal !== 'string')
+                                    return [];
+                                return [{
+                                        id: item.id,
+                                        status: item.status,
+                                        goal: item.goal,
+                                        ...(typeof item.activity === 'string' ? { activity: item.activity } : {}),
+                                    }];
+                            }));
+                            break;
+                        }
+                    }
                     setCurrentStep(describeFactStatus(event.data));
                     break;
                 case 'error':
@@ -122,10 +191,25 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
                     setIsRunning(false);
                     setCurrentStep(null);
                     setApprovalRequest(null);
+                    setAskRequest(null);
+                    setLanes([]);
                     break;
                 case 'complete':
                     setIsRunning(false);
                     setCurrentStep(null);
+                    setApprovalRequest(null);
+                    setAskRequest(null);
+                    if (event.data && typeof event.data === 'object' && !Array.isArray(event.data)) {
+                        const completion = event.data;
+                        const completionError = completion.error;
+                        if (completion.status === 'failed' && completionError && typeof completionError === 'object' && !Array.isArray(completionError)) {
+                            const error = completionError;
+                            setError(`${String(error.code ?? 'RUN_FAILED')}: ${String(error.message ?? '运行失败')}`);
+                        }
+                        else if (completion.status === 'failed') {
+                            setError('RUN_FAILED: 运行失败');
+                        }
+                    }
                     break;
             }
         }
@@ -134,10 +218,12 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
         setIsRunning(false);
         setCurrentStep(null);
         setApprovalRequest(null);
+        setAskRequest(null);
         runRef.current = null;
     }, []);
-    const sendMessage = useCallback(async (text) => {
-        if (!host || !conversationId)
+    const sendMessage = useCallback(async (text, targetConversationId) => {
+        const activeConversationId = targetConversationId ?? conversationId;
+        if (!host || !activeConversationId)
             return;
         if (runRef.current) {
             try {
@@ -154,7 +240,7 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
         setError(null);
         setCurrentStep('思考中...');
         try {
-            const run = await host.sendMessage(conversationId, { text });
+            const run = await host.sendMessage(activeConversationId, { text });
             await consumeRun(run);
         }
         catch (e) {
@@ -164,14 +250,15 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
             finishRun();
         }
     }, [host, conversationId, consumeRun, finishRun]);
-    const resumeActive = useCallback(async () => {
-        if (!host || !conversationId || runRef.current)
+    const resumeActive = useCallback(async (targetConversationId) => {
+        const activeConversationId = targetConversationId ?? conversationId;
+        if (!host || !activeConversationId || runRef.current)
             return;
         setIsRunning(true);
         setError(null);
         setCurrentStep('正在恢复未完成的运行...');
         try {
-            const run = await host.resumeRun(conversationId);
+            const run = await host.resumeRun(activeConversationId);
             await consumeRun(run);
         }
         catch (e) {
@@ -187,12 +274,41 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
             void run.cancel('USER_INTERRUPT');
     }, []);
     const approveAction = useCallback(async (effectId, approved, reason) => {
-        if (!effectId || !runRef.current)
+        if (!effectId || !runRef.current || approvalSubmitting)
             return;
-        await runRef.current.reply(effectId, { approved, ...(approved ? {} : { reason: reason || '拒绝执行' }) });
-        setApprovalRequest(null);
-        setCurrentStep('审批已提交，正在继续...');
-    }, []);
+        setApprovalSubmitting(true);
+        try {
+            await runRef.current.reply(effectId, { approved, ...(approved ? {} : { reason: reason || '拒绝执行' }) });
+            setApprovalRequest(null);
+            setCurrentStep('审批已提交，正在继续...');
+            setError(null);
+        }
+        catch (e) {
+            setError(`审批提交失败: ${e instanceof Error ? e.message : String(e)}`);
+            setCurrentStep('审批仍在等待，请重新选择。');
+        }
+        finally {
+            setApprovalSubmitting(false);
+        }
+    }, [approvalSubmitting]);
+    const replyAsk = useCallback(async (effectId, value) => {
+        if (!effectId || !runRef.current || approvalSubmitting)
+            return;
+        setApprovalSubmitting(true);
+        try {
+            await runRef.current.reply(effectId, value);
+            setAskRequest(null);
+            setCurrentStep('回答已提交，正在继续...');
+            setError(null);
+        }
+        catch (e) {
+            setError(`回答提交失败: ${e instanceof Error ? e.message : String(e)}`);
+            setCurrentStep('仍在等待你的回答，请重新选择。');
+        }
+        finally {
+            setApprovalSubmitting(false);
+        }
+    }, [approvalSubmitting]);
     const cancelRun = useCallback(async () => {
         if (runRef.current) {
             await runRef.current.cancel('USER_CANCELLED');
@@ -205,9 +321,13 @@ export function useRun({ host, conversationId, addAssistantMessage, }) {
         currentStep,
         error,
         approvalRequest,
+        askRequest,
+        lanes,
+        approvalSubmitting,
         sendMessage,
         resumeActive,
         approveAction,
+        replyAsk,
         cancelRun,
     };
 }

package/dist/hooks/useSlashCommands.d.ts

@@ -8,6 +8,7 @@ export interface SlashCommandDependencies {
     onQuit?: () => void | Promise<void>;
     onCancel?: () => void | Promise<void>;
     onNew?: () => void | Promise<void>;
+    onResume?: () => void | Promise<void>;
     onSessions?: () => void | Promise<void>;
     onDelete?: (args: string) => void | Promise<void>;
     onExport?: (args: string) => void | Promise<void>;

package/dist/hooks/useSlashCommands.js

@@ -9,6 +9,7 @@ export function useSlashCommands(deps) {
         { name: '/quit', aliases: ['/q'], description: '退出程序', execute: async () => deps.onQuit?.() },
         { name: '/cancel', aliases: ['/stop'], description: '取消当前运行（保留会话）', execute: async () => deps.onCancel?.() },
         { name: '/new', description: '开启新会话', execute: async () => deps.onNew?.() },
+        { name: '/resume', description: '恢复上一次会话或未完成运行', execute: async () => deps.onResume?.() },
         { name: '/sessions', description: '查看所有会话', execute: async () => deps.onSessions?.() },
         { name: '/delete', description: '删除会话 [id]', execute: async (args) => deps.onDelete?.(args) },
         { name: '/export', description: '导出会话 [markdown|json]', execute: async (args) => deps.onExport?.(args) },

package/dist/types.d.ts

@@ -31,9 +31,16 @@ export interface ToolCallDisplay {
     name: string;
     arguments?: Record<string, unknown> | undefined;
     result?: unknown;
-    status: 'running' | 'succeeded' | 'failed';
+    status: 'running' | 'succeeded' | 'failed' | 'cancelled';
     durationMs?: number | undefined;
 }
+/** Runtime lane snapshot rendered in the bottom status HUD. */
+export interface LaneDisplay {
+    id: string;
+    status: string;
+    goal: string;
+    activity?: string | undefined;
+}
 /** Token 统计数据 */
 export interface TokenStatsData {
     inputTokens: number;
@@ -55,6 +62,21 @@ export interface ApprovalRequest {
         input: Record<string, unknown>;
     }> | undefined;
 }
+export type AskType = 'choice' | 'multi' | 'input';
+export interface AskRequest {
+    effectId: string;
+    toolName: string;
+    type: AskType;
+    prompt: string;
+    options?: Array<{
+        label: string;
+        value: string;
+    }> | undefined;
+    min?: number | undefined;
+    max?: number | undefined;
+    placeholder?: string | undefined;
+    defaultValue?: string | undefined;
+}
 /** 应用状态模式 */
 export type AppMode = 'chat' | 'sessions' | 'help' | 'config';
 /** 解析后的命令行参数 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hunterzhu/pulse-cli",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/zhuhengtan/Pulse"
@@ -19,7 +19,7 @@
     "build": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@hunterzhu/pulse-server": "0.1.6",
+    "@hunterzhu/pulse-server": "0.1.7",
     "ink": "^7.1.1",
     "react": "^19.0.0",
     "ink-spinner": "^5.0.0",