deepclause-sdk 0.0.65 → 0.0.66

package/dist/cli/tui.js

@@ -7,7 +7,7 @@ import { listCommands } from './commands.js';
 import { getConfigPath, loadConfig, resolveModelSlot, setModel } from './config.js';
 import { run } from './run.js';
 import { formatToolArgs } from './tool-args.js';
-import { createLocalSkill, createConductorSession, getConductorSessionDetail, listConductorSessions, runConductorTurn, } from '../system/runtime/conductor.js';
+import { createSessionExecutionLogWriter, createLocalSkill, createConductorSession, getConductorSessionDetail, listConductorSessions, runConductorTurn, } from '../system/runtime/conductor.js';
 import { getSystemAssetSourcePaths } from '../system/assets/index.js';
 import { createShellManager } from '../system/runtime/shell-manager.js';
 import { buildToolCompletionEvent, buildToolFailureEvent, buildToolStartEvent, createShellToolEventBridge, } from '../system/runtime/shell-tool-events.js';
@@ -917,6 +917,7 @@ class FullscreenTui {
         this.requestRender();
         try {
             const result = await runSkillCommand(this.workspaceRoot, skillName, args, {
+                sessionId: this.selectedSessionId || undefined,
                 sandbox: this.options.sandbox,
                 signal: this.currentAbortController.signal,
                 onUserInput: (question) => this.requestClarification(question),
@@ -2507,12 +2508,7 @@ class FullscreenTui {
         for (const entry of visibleEntries) {
             const header = this.formatMessageHeader(entry);
             lines.push(header);
-            const bodyLines = entry.content
-                ? entry.content.split(/\r?\n/)
-                : (entry.pending ? [''] : ['(empty)']);
-            if (entry.pending && !entry.content) {
-                bodyLines[0] = 'thinking...';
-            }
+            const bodyLines = formatDisplayMessageBodyLines(entry);
             for (const line of bodyLines) {
                 lines.push(`  ${line}`);
             }
@@ -2936,6 +2932,7 @@ async function startLineTui(workspaceRoot = process.cwd(), options = {}) {
                 const printer = new LiveExecutionPrinter();
                 try {
                     await runSkillCommand(workspaceRoot, parsed.name, parsed.args, {
+                        sessionId: session.id,
                         sandbox: options.sandbox,
                         onUserInput: async (question) => {
                             printer.finish();
@@ -3010,23 +3007,52 @@ export async function runPromptHeadless(prompt, workspaceRoot = process.cwd(), o
         throw new Error(result.error);
     }
 }
-async function runSkillCommand(workspaceRoot, skillName, args, options = {}) {
+export async function runSkillCommand(workspaceRoot, skillName, args, options = {}) {
     const commands = await listCommands(workspaceRoot);
     const command = commands.find((entry) => entry.name === skillName);
     if (!command) {
         throw new Error(`Unknown skill: ${skillName}`);
     }
-    const result = await run(command.path, args, {
-        configRoot: workspaceRoot,
-        headless: true,
-        stream: true,
-        sandbox: options.sandbox,
-        signal: options.signal,
-        onUserInput: options.onUserInput,
-        onEvent: (event) => options.onEvent?.({ scope: 'child', childSlug: skillName, event }),
-        onChildEvent: (childSlug, event) => options.onEvent?.({ scope: 'child', childSlug, event }),
-    });
-    return result;
+    const executionLog = options.sessionId
+        ? createSessionExecutionLogWriter({
+            workspaceRoot,
+            sessionId: options.sessionId,
+            executionKind: 'skill',
+            inputText: `/${skillName}${args.length > 0 ? ` ${args.join(' ')}` : ''}`,
+            skillName,
+            args,
+        })
+        : null;
+    const emitLogEvent = (event) => {
+        executionLog?.recordEvent(event);
+        options.onEvent?.(event);
+    };
+    try {
+        const result = await run(command.path, args, {
+            configRoot: workspaceRoot,
+            headless: true,
+            stream: true,
+            sandbox: options.sandbox,
+            signal: options.signal,
+            onUserInput: options.onUserInput,
+            onEvent: (event) => emitLogEvent({ scope: 'child', childSlug: skillName, event }),
+            onChildEvent: (childSlug, event) => emitLogEvent({ scope: 'child', childSlug, event }),
+        });
+        await executionLog?.finish({
+            status: result.error ? 'error' : 'success',
+            answer: result.answer,
+            error: result.error,
+            outputCount: result.output.length,
+        });
+        return result;
+    }
+    catch (error) {
+        await executionLog?.finish({
+            status: 'error',
+            error: error.message,
+        });
+        throw error;
+    }
 }
 async function runSkillCreatorCommand(workspaceRoot, sessionId, spec, options = {}) {
     const trimmedSpec = spec.trim();
@@ -3036,19 +3062,41 @@ async function runSkillCreatorCommand(workspaceRoot, sessionId, spec, options =
     const config = await loadConfig(workspaceRoot);
     const compileSelection = resolveModelSlot(config, 'compile');
     const runSelection = resolveModelSlot(config, 'run');
-    return createLocalSkill({
-        spec: trimmedSpec,
+    const executionLog = createSessionExecutionLogWriter({
         workspaceRoot,
-        workspacePath: path.resolve(workspaceRoot, config.workspace || './workspace'),
-        config,
-        compileSelection,
-        runSelection,
         sessionId,
-        sandbox: options.sandbox ?? false,
-        signal: options.signal,
-        onUserInput: options.onUserInput ?? (async () => ''),
-        onEvent: options.onEvent,
+        executionKind: 'skill-creator',
+        inputText: trimmedSpec,
+        skillName: 'skill-creator',
     });
+    const emitLogEvent = (event) => {
+        executionLog.recordEvent(event);
+        options.onEvent?.(event);
+    };
+    try {
+        const result = await createLocalSkill({
+            spec: trimmedSpec,
+            workspaceRoot,
+            workspacePath: path.resolve(workspaceRoot, config.workspace || './workspace'),
+            config,
+            compileSelection,
+            runSelection,
+            sessionId,
+            sandbox: options.sandbox ?? false,
+            signal: options.signal,
+            onUserInput: options.onUserInput ?? (async () => ''),
+            onEvent: emitLogEvent,
+        });
+        await executionLog.finish({ status: 'success' });
+        return result;
+    }
+    catch (error) {
+        await executionLog.finish({
+            status: 'error',
+            error: error.message,
+        });
+        throw error;
+    }
 }
 async function runShellCommand(workspaceRoot, command, options = {}) {
     const trimmedCommand = command.trim();
@@ -3454,7 +3502,11 @@ export function formatDisplayMessageHeader(entry, spinner = '') {
         case 'user':
             return '[You]';
         case 'assistant': {
-            const base = entry.error ? 'Assistant Error' : 'Assistant';
+            const base = entry.error
+                ? 'Assistant Error'
+                : entry.pending
+                    ? 'Thinking'
+                    : 'Assistant';
             return entry.tag
                 ? `[${base}: ${entry.tag}${spinner}]`
                 : `[${base}${spinner}]`;
@@ -3463,6 +3515,18 @@ export function formatDisplayMessageHeader(entry, spinner = '') {
             return formatSystemMessageHeader(entry, spinner);
     }
 }
+export function formatDisplayMessageBodyLines(entry) {
+    const bodyLines = entry.content
+        ? entry.content.split(/\r?\n/)
+        : (entry.pending ? [''] : ['(empty)']);
+    if (!entry.pending) {
+        return bodyLines;
+    }
+    if (!entry.content) {
+        return ['thinking> generating intermediate output...'];
+    }
+    return bodyLines.map((line) => line ? `thinking> ${line}` : 'thinking>');
+}
 function formatSystemAssetSourcePath(workspaceRoot, filePath) {
     const relativePath = path.relative(workspaceRoot, filePath);
     if (relativePath && !relativePath.startsWith('..') && !path.isAbsolute(relativePath)) {
@@ -3874,9 +3938,15 @@ function renderWindowBody(text, innerWidth, kind) {
         if (text.startsWith('[Assistant Error]')) {
             return `${border}${paint(content, ANSI.red, ANSI.bgBlue, ANSI.bold)}${border}`;
         }
+        if (text.startsWith('[Thinking')) {
+            return `${border}${paint(content, ANSI.cyan, ANSI.bgBlue, ANSI.bold)}${border}`;
+        }
         if (text.startsWith('[Assistant')) {
             return `${border}${paint(content, ANSI.brightYellow, ANSI.bgBlue, ANSI.bold)}${border}`;
         }
+        if (text.startsWith('  thinking>')) {
+            return `${border}${paint(content, ANSI.cyan, ANSI.bgBlue, ANSI.dim)}${border}`;
+        }
         if (text.startsWith('[System')) {
             return `${border}${paint(content, ANSI.cyan, ANSI.bgBlue, ANSI.bold)}${border}`;
         }