@dotdrelle/wiki-manager 0.11.9 → 0.12.0

package/src/shell/useSession.ts

@@ -3,10 +3,11 @@ import { isAbsolute, relative, resolve, sep } from 'node:path';
 import { createEffect, createMemo, createSignal, onCleanup } from 'solid-js';
 import { formatMcpToolResult, callMcpTool } from '../core/mcp.js';
 import { extractActivity, parseJsonText, sessionActivities } from '../core/activity.js';
-import { formatPlanStatus, formatCompletedActivities } from '../core/plan.js';
+import { formatPlanStatus, formatCompletedActivities, formatPlanStep } from '../core/plan.js';
 import { createAgentEvent, dispatchAgentEvent } from '../core/agentEvents.js';
 import { projectQueue, queueCounts, startNextQueuedJob, syncQueueWithActivity } from '../core/jobQueue.js';
 import { queueStoreFor } from '../core/queueStore.js';
+import { filterRuntimeLogs } from '../core/runtimeLog.js';
 import { fetchRuntimeState, streamRuntimeEvents } from '../runtime/client.js';
 import type { ActiveFileEditor } from './FileEditorDialog';
 import {
@@ -99,11 +100,13 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     },
   });
   const runtimeRunStatus = createMemo(() => String(runtimeState()?.status ?? 'idle'));
-  const agentBusy = createMemo(() =>
+  const conversationBusy = createMemo(() => agent.busy());
+  const executionActive = createMemo(() =>
     props.runtime?.url
-      ? runtimeRunStatus() === 'running' || agent.busy()
-      : agent.busy(),
+      ? runtimeRunStatus() === 'running'
+      : sessionActivities(session).some((activity) => !activity.terminal),
   );
+  const agentBusy = conversationBusy;
   const localFallbackActive = createMemo(() => !props.runtime?.url || runtimeStatus() === 'disconnected');
 
   // Runtime conversation entries are merged into conversationMessages(session)
@@ -182,6 +185,20 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
   let lastVisiblePlan: Array<{ step: number; description: string; status: string }> | null = null;
   const activities = createMemo(() => {
     version();
+    const activityLines = nonEmptyRuntimeArray(runtimeState()?.workflow?.activity?.lines);
+    if (activityLines) {
+      return activityLines.map((line: any, index: number) => ({
+        key: line.id ?? `activity-line-${index}`,
+        id: line.id ?? `activity-line-${index}`,
+        label: line.label,
+        status: line.status ?? 'running',
+        progress: line.progress ?? null,
+        terminal: ['done', 'failed', 'cancelled'].includes(String(line.status)),
+        _runtime: true,
+        _workflow: true,
+        _aggregated: true,
+      }));
+    }
     const workflowActivities = nonEmptyRuntimeArray(runtimeState()?.workflow?.nodes?.filter((node: any) => node.type === 'activity'));
     if (workflowActivities) {
       return workflowActivities.map((node: any) => ({
@@ -246,7 +263,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
         .sort((a: any, b: any) => Number(a.step ?? 0) - Number(b.step ?? 0))
         .map((node: any, index: number) => ({
           step: Number(node.step ?? index + 1),
-          description: String(node.description ?? node.label ?? `Step ${index + 1}`),
+          description: formatPlanStep(node) || `Step ${index + 1}`,
           status: String(node.status ?? 'pending'),
         }));
     }
@@ -254,7 +271,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     if (runtimePlan) {
       return runtimePlan.map((step: any, index: number) => ({
         step: Number(step.step ?? index + 1),
-        description: String(step.description ?? step.label ?? step.name ?? `Step ${index + 1}`),
+        description: formatPlanStep(step) || `Step ${index + 1}`,
         status: String(step.status ?? 'pending'),
       }));
     }
@@ -272,8 +289,9 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     version();
     const runtimeLogs = runtimeState()?.logs;
     if (!Array.isArray(runtimeLogs) || runtimeLogs.length === 0) return logs();
-    const tagged = runtimeLogs.slice(-80).map((line: any) => `runtime ${String(line)}`);
-    return [...logs(), ...tagged].slice(-200);
+    const filter = String((session as any).runtimeLogFilter ?? '').trim();
+    const tagged = filterRuntimeLogs(runtimeLogs.map((line: any) => `runtime ${String(line)}`), filter);
+    return [...logs(), ...tagged];
   });
 
   // Index-aligned with each workspace's runtimeConversation array — not just
@@ -291,6 +309,13 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     const target = conversationMessages(session);
     const backed = runtimeConversationRefsByWorkspace.get(workspace) ?? [];
     runtimeConversationRefsByWorkspace.set(workspace, backed);
+    if (backed.length === 0 && target.length === 0 && !runtimeConversation.some((message: any) => message?._pending)) {
+      backed.push(...runtimeConversation.map((message: any) => ({
+        role: message.role === 'assistant' ? 'donna' : message.role,
+        content: String(message.content ?? ''),
+      })));
+      return;
+    }
     for (let i = 0; i < runtimeConversation.length; i += 1) {
       const message = runtimeConversation[i];
       const content = String(message.content ?? '');
@@ -437,7 +462,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
               const plan = (session as any).headlessPlan;
               const stillRunning = sessionActivities(session).filter((a) => !a.terminal && a.poll);
               const pendingSteps = (plan ?? []).filter((s: any) => s.status === 'pending');
-              if (stillRunning.length === 0 && pendingSteps.length > 0 && !agentBusy()) {
+              if (stillRunning.length === 0 && pendingSteps.length > 0 && !conversationBusy()) {
                 const completedAll = sessionActivities(session).filter((a) => a.terminal);
                 const prompt = buildContinuationPrompt(session, completedAll);
                 void agent.submit(prompt);
@@ -469,7 +494,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
 
   async function submitInput(submittedValue?: string) {
     const line = typeof submittedValue === 'string' && submittedValue.trim() ? submittedValue : input();
-    if (agentBusy()) return { exit: false, busy: true };
+    if (conversationBusy()) return { exit: false, busy: true };
     setInput('');
     setConversationScroll(0);
     if (line.trim()) {
@@ -593,6 +618,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     session,
     messages,
     logs: visibleLogs,
+    runtimeLogFilter: () => String((session as any).runtimeLogFilter ?? ''),
     input,
     setInput: updateInput,
     title,
@@ -613,6 +639,8 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     plan,
     conversationScroll,
     scrollConversation,
+    conversationBusy,
+    executionActive,
     busy: agentBusy,
     abort,
     submitInput,