orquesta-cli 0.2.44 → 0.2.46

package/dist/ui/components/PlanExecuteApp.js

@@ -38,6 +38,7 @@ import { readHookConfig } from '../../orquesta/hook-init.js';
 import { remotePhone } from '../../orquesta/remote-phone.js';
 import { logger } from '../../utils/logger.js';
 import { usageTracker } from '../../core/usage-tracker.js';
+import { estimateCost, formatCostUsd } from '../../core/pricing.js';
 import { UpdateNotification } from '../UpdateNotification.js';
 import { checkForCliUpdate, runCliUpdate, setSkippedVersion } from '../../utils/update-checker.js';
 import { setToolExecutionCallback, setTellToUserCallback, setToolResponseCallback, setPlanCreatedCallback, setTodoStartCallback, setTodoCompleteCallback, setTodoFailCallback, setCompactCallback, setAssistantResponseCallback, setToolApprovalCallback, setReasoningCallback, } from '../../tools/llm/simple/file-tools.js';
@@ -88,7 +89,7 @@ function getStatusText({ phase, todos, currentToolName }) {
     }
     return `${progressPrefix}Processing`;
 }
-export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
+export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo, resumeLastSession }) => {
     const { exit } = useApp();
     const hookBinding = useMemo(() => {
         const cfg = readHookConfig(process.cwd());
@@ -103,6 +104,7 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
     const [messages, setMessages] = useState([]);
     const { input, setInput, handleHistoryPrev, handleHistoryNext, addToHistory } = useInputHistory();
     const [isProcessing, setIsProcessing] = useState(false);
+    const [streamingText, setStreamingText] = useState('');
     const [updatePhase, setUpdatePhase] = useState('hidden');
     const [updateLatest, setUpdateLatest] = useState('');
     const [updateProgress, setUpdateProgress] = useState('');
@@ -168,6 +170,21 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
     useEffect(() => {
         sessionManager.setLogEntries(logEntries);
     }, [logEntries]);
+    useEffect(() => {
+        if (!resumeLastSession)
+            return;
+        (async () => {
+            const sessions = await sessionManager.listSessions();
+            if (sessions.length === 0)
+                return;
+            const last = sessions[0];
+            const data = await sessionManager.loadSession(last.id);
+            if (data && data.messages.length > 0) {
+                setMessages(data.messages);
+                addLog({ type: 'session_restored', content: `↩ Resumed session (${data.messages.filter(m => m.role === 'user').length} messages)` });
+            }
+        })();
+    }, [resumeLastSession]);
     const fileBrowserState = useFileBrowserState(input, isProcessing);
     const commandBrowserState = useCommandBrowserState(input, isProcessing);
     const planExecutionState = usePlanExecution(pendingMessageCallbacks);
@@ -261,6 +278,7 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
     }, [addLog]);
     useEffect(() => {
         setAssistantResponseCallback((content) => {
+            setStreamingText('');
             addLog({
                 type: 'assistant_message',
                 content,
@@ -271,6 +289,17 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
             setAssistantResponseCallback(null);
         };
     }, [addLog]);
+    useEffect(() => {
+        if (llmClient) {
+            llmClient.onStreamingContent = (token) => {
+                setStreamingText(prev => prev + token);
+            };
+        }
+        return () => {
+            if (llmClient)
+                llmClient.onStreamingContent = null;
+        };
+    }, [llmClient]);
     useEffect(() => {
         setReasoningCallback((content, _isStreaming) => {
             addLog({
@@ -432,29 +461,30 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
             logger.startTimer('app-init');
             try {
                 setInitStep('health');
-                logger.flow('Running health check');
+                logger.flow('Running health check + docs init in parallel');
                 setHealthStatus('checking');
-                if (configManager.hasEndpoints()) {
-                    const healthResults = await LLMClient.healthCheckAll();
-                    let hasHealthy = false;
-                    for (const [endpointId, modelResults] of healthResults) {
-                        logger.vars({ name: 'endpointId', value: endpointId }, { name: 'healthyModels', value: modelResults.filter(r => r.healthy).length });
-                        if (modelResults.some((r) => r.healthy)) {
-                            hasHealthy = true;
+                const healthPromise = (async () => {
+                    if (configManager.hasEndpoints()) {
+                        const healthResults = await LLMClient.healthCheckAll();
+                        let hasHealthy = false;
+                        for (const [endpointId, modelResults] of healthResults) {
+                            logger.vars({ name: 'endpointId', value: endpointId }, { name: 'healthyModels', value: modelResults.filter(r => r.healthy).length });
+                            if (modelResults.some((r) => r.healthy)) {
+                                hasHealthy = true;
+                            }
                         }
+                        logger.state('Health status', 'checking', hasHealthy ? 'healthy' : 'unhealthy');
+                        setHealthStatus(hasHealthy ? 'healthy' : 'unhealthy');
+                        await configManager.updateAllHealthStatus(healthResults);
                     }
-                    logger.state('Health status', 'checking', hasHealthy ? 'healthy' : 'unhealthy');
-                    setHealthStatus(hasHealthy ? 'healthy' : 'unhealthy');
-                    await configManager.updateAllHealthStatus(healthResults);
-                }
-                else {
-                    setHealthStatus('unknown');
-                }
-                setInitStep('docs');
-                logger.flow('Initializing docs directory');
-                await initializeDocsDirectory().catch((err) => {
+                    else {
+                        setHealthStatus('unknown');
+                    }
+                })();
+                const docsPromise = initializeDocsDirectory().catch((err) => {
                     logger.warn('Docs directory initialization warning', { error: err });
                 });
+                await Promise.all([healthPromise, docsPromise]);
                 setInitStep('config');
                 logger.flow('Checking configuration');
                 if (!configManager.hasEndpoints()) {
@@ -938,6 +968,7 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
         let updatedMessages = [...messages, userMsg];
         setMessages(updatedMessages);
         setIsProcessing(true);
+        setStreamingText('');
         setActivityStartTime(Date.now());
         setSubActivities([]);
         if (llmClient) {
@@ -1389,8 +1420,10 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
         React.createElement(Static, { items: logEntries }, (entry) => renderLogEntry(entry)),
         pendingToolApproval && (React.createElement(Box, { marginY: 1 },
             React.createElement(ApprovalDialog, { toolName: pendingToolApproval.toolName, args: pendingToolApproval.args, reason: pendingToolApproval.reason, onResponse: handleApprovalResponse }))),
-        isProcessing && (planExecutionState.executionPhase === 'planning' || planExecutionState.todos.length === 0) && !pendingToolApproval && !isDocsSearching && (React.createElement(Box, { marginY: 1 },
-            React.createElement(ActivityIndicator, { activity: getCurrentActivityType(), startTime: activityStartTime, detail: activityDetail, subActivities: subActivities, modelName: currentModelInfo.model }))),
+        isProcessing && (planExecutionState.executionPhase === 'planning' || planExecutionState.todos.length === 0) && !pendingToolApproval && !isDocsSearching && (React.createElement(Box, { marginY: 1, flexDirection: "column" },
+            React.createElement(ActivityIndicator, { activity: getCurrentActivityType(), startTime: activityStartTime, detail: activityDetail, subActivities: subActivities, modelName: currentModelInfo.model }),
+            streamingText && (React.createElement(Box, { marginTop: 1, paddingX: 1 },
+                React.createElement(Text, { wrap: "wrap" }, streamingText))))),
         isDocsSearching && (React.createElement(DocsSearchProgress, { logs: docsSearchLogs, isSearching: isDocsSearching })),
         planExecutionState.todos.length > 0 && (React.createElement(Box, { marginTop: 2, marginBottom: 1 },
             React.createElement(TodoPanel, { todos: planExecutionState.todos, currentTodoId: planExecutionState.currentTodoId, isProcessing: isProcessing }))),
@@ -1458,7 +1491,11 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
                         ' ',
                         "(esc to interrupt \u00B7 ",
                         formatElapsedTime(sessionElapsed),
-                        sessionTokens > 0 && ` · ↑ ${formatTokensCompact(sessionTokens)} tokens`,
+                        sessionTokens > 0 && (() => {
+                            const usage = usageTracker.getSessionUsage();
+                            const cost = estimateCost(currentModelInfo.model, usage.inputTokens, usage.outputTokens);
+                            return ` · ↑ ${formatTokensCompact(sessionTokens)} tokens${cost ? ` · ${formatCostUsd(cost)}` : ''}`;
+                        })(),
                         ")"))),
             React.createElement(Box, null,
                 (() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orquesta-cli",
-  "version": "0.2.44",
+  "version": "0.2.46",
   "description": "Orquesta CLI - AI-powered coding assistant with team collaboration",
   "type": "module",
   "main": "dist/index.js",
@@ -11,14 +11,16 @@
   "scripts": {
     "preinstall": "node scripts/check-node.cjs",
     "build": "tsc",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "postbuild": "chmod +x dist/cli.js",
-    "dev": "ts-node src/cli.ts",
+    "dev": "tsx watch src/cli.ts",
     "start": "node dist/cli.js",
     "watch": "tsc --watch",
     "lint": "eslint src/**/*.ts",
     "lint:fix": "eslint src/**/*.ts --fix",
     "format": "prettier --write \"src/**/*.ts\"",
-    "test": "cd tests && python -m pytest test_eval.py -v",
+    "test:eval": "cd tests && python -m pytest test_eval.py -v",
     "test:quick": "cd tests && python -m pytest test_eval.py -v -m 'not slow'",
     "prepr": "npm run lint && npm run build",
     "bun:build": "node scripts/inject-version.js && npm run build && bun build dist/cli.js --compile --outfile bin/lcli && cp node_modules/yoga-wasm-web/dist/yoga.wasm bin/",
@@ -126,7 +128,9 @@
     "react-devtools-core": "^4.28.5",
     "react-dom": "^18.3.1",
     "ts-node": "^10.9.2",
+    "tsx": "^4.19.0",
     "typescript": "^5.3.3",
-    "vite": "^7.3.1"
+    "vite": "^7.3.1",
+    "vitest": "^3.2.1"
   }
 }