@steerable/agent-shell-web 0.6.51 → 0.6.53

package/src/components/chat/composer-status-stack.tsx

@@ -0,0 +1,79 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+  type ReactNode,
+} from 'react';
+
+export type ComposerStatusPanelId = 'orchestration' | 'todos';
+
+type ComposerStatusContextValue = {
+  activeId: ComposerStatusPanelId | null;
+  claim: (id: ComposerStatusPanelId, force: boolean) => void;
+  release: (id: ComposerStatusPanelId) => void;
+};
+
+const ComposerStatusContext = createContext<ComposerStatusContextValue | null>(null);
+
+/**
+ * Right-aligned column for the composer status pills (orchestration + todos).
+ * At most one panel is expanded; a user click steals the open slot, while an
+ * automatic open only claims it when nothing else is showing.
+ */
+export function ComposerStatusStack({ children }: { children: ReactNode }) {
+  const [activeId, setActiveId] = useState<ComposerStatusPanelId | null>(null);
+  const claim = useCallback((id: ComposerStatusPanelId, force: boolean) => {
+    setActiveId((current) => {
+      if (force || current == null || current === id) return id;
+      return current;
+    });
+  }, []);
+  const release = useCallback((id: ComposerStatusPanelId) => {
+    setActiveId((current) => (current === id ? null : current));
+  }, []);
+  const value = useMemo(
+    () => ({ activeId, claim, release }),
+    [activeId, claim, release],
+  );
+
+  return (
+    <ComposerStatusContext.Provider value={value}>
+      <div
+        className="flex min-w-0 flex-col items-end gap-1.5"
+        data-testid="composer-status-stack"
+      >
+        {children}
+      </div>
+    </ComposerStatusContext.Provider>
+  );
+}
+
+/**
+ * Fold a panel's own open preference into the stack.
+ * Outside a stack, `expanded` follows `desired` directly.
+ */
+export function useExclusiveExpand(
+  id: ComposerStatusPanelId,
+  desired: boolean,
+): { expanded: boolean; requestOpen: () => void } {
+  const ctx = useContext(ComposerStatusContext);
+  const wasDesired = useRef(false);
+
+  useLayoutEffect(() => {
+    if (!ctx) return;
+    if (desired && !wasDesired.current) ctx.claim(id, false);
+    if (!desired && wasDesired.current) ctx.release(id);
+    wasDesired.current = desired;
+  }, [ctx, desired, id]);
+
+  const requestOpen = useCallback(() => {
+    ctx?.claim(id, true);
+  }, [ctx, id]);
+
+  const expanded = ctx ? desired && ctx.activeId === id : desired;
+  return { expanded, requestOpen };
+}

package/src/components/chat/orchestration-flow-model.ts

@@ -29,7 +29,8 @@ export type OrchestrationNodeStatus =
   | 'completed'
   | 'failed'
   | 'interrupted'
-  | 'closed';
+  | 'closed'
+  | 'cancelled';
 
 export interface OrchestrationSteer {
   message: string;
@@ -70,6 +71,77 @@ interface ActionLike {
   result?: unknown;
 }
 
+function toNodeStatus(raw: string | undefined): OrchestrationNodeStatus {
+  switch (raw) {
+    case 'pending':
+    case 'running':
+    case 'completed':
+    case 'failed':
+    case 'interrupted':
+    case 'closed':
+    case 'cancelled':
+      return raw;
+    case 'error':
+      return 'failed';
+    default:
+      return 'running';
+  }
+}
+
+function buildOrchestrationFlow(nodes: OrchestrationChildNode[]): OrchestrationFlowData | null {
+  if (nodes.length === 0) return null;
+
+  const totalCount = nodes.length;
+  const completedCount = nodes.filter((n) => n.status === 'completed').length;
+  const runningCount = nodes.filter((n) => n.status === 'running' || n.status === 'pending').length;
+  const failedCount = nodes.filter((n) => n.status === 'failed').length;
+  const interruptedCount = nodes.filter((n) => n.status === 'interrupted').length;
+  const closedCount = nodes.filter((n) => n.status === 'closed' || n.status === 'cancelled').length;
+  const isAllCompleted = totalCount > 0 && completedCount === totalCount;
+  const hasActive = runningCount > 0;
+
+  let summaryCopy = '';
+  if (isAllCompleted) {
+    summaryCopy = `${completedCount}/${totalCount} 全部完成`;
+  } else if (hasActive) {
+    summaryCopy = `协同执行中 (${completedCount}/${totalCount} 完成)...`;
+  } else {
+    summaryCopy = `${completedCount} 完成 · ${totalCount - completedCount} 结束 (${totalCount} 个子任务)`;
+  }
+
+  return {
+    nodes,
+    totalCount,
+    completedCount,
+    runningCount,
+    failedCount,
+    interruptedCount,
+    closedCount,
+    isAllCompleted,
+    hasActive,
+    summaryCopy,
+  };
+}
+
+/**
+ * 父回合已经结束时，还标着 running/pending 的分支不会再收到子代理终态
+ * （停止发生在流关闭之后）。把它们收成 cancelled，避免胶囊一直停在「协同执行中」。
+ */
+export function settleStoppedOrchestration(flow: OrchestrationFlowData): OrchestrationFlowData {
+  if (!flow.nodes.some((node) => node.status === 'running' || node.status === 'pending')) {
+    return flow;
+  }
+  return (
+    buildOrchestrationFlow(
+      flow.nodes.map((node) =>
+        node.status === 'running' || node.status === 'pending'
+          ? { ...node, status: 'cancelled' }
+          : node,
+      ),
+    ) ?? flow
+  );
+}
+
 function safeParseJson(value: unknown): Record<string, unknown> | null {
   if (!value) return null;
   if (typeof value === 'object' && !Array.isArray(value)) {
@@ -104,7 +176,7 @@ export function extractOrchestrationFlow(
       nodeMap.set(c.childId, {
         childId: c.childId,
         task: c.task || '',
-        status: (c.status as OrchestrationNodeStatus) || 'running',
+        status: toNodeStatus(c.status),
         recordId: c.recordId,
         steers: [],
       });
@@ -189,6 +261,14 @@ export function extractOrchestrationFlow(
         } else if (waitStatus === 'failed' || waitStatus === 'error' || envelope.success === false) {
           node.status = 'failed';
           node.error = envelope.error || '执行失败';
+        } else if (waitStatus === 'cancelled') {
+          node.status = 'cancelled';
+        } else if (waitStatus === 'interrupted') {
+          node.interrupted = true;
+          node.status = 'interrupted';
+        } else if (waitStatus === 'closed') {
+          node.closed = true;
+          if (node.status !== 'completed') node.status = 'closed';
         } else if (waitStatus === 'running') {
           node.status = 'running';
         }
@@ -232,19 +312,26 @@ export function extractOrchestrationFlow(
           if (rawChild && typeof rawChild === 'object') {
             const cid = typeof rawChild.childId === 'string' ? rawChild.childId : '';
             if (!cid) continue;
+            const listedStatus =
+              typeof rawChild.status === 'string' ? toNodeStatus(rawChild.status) : undefined;
+            const listedAnswer =
+              (typeof rawChild.answer === 'string' && rawChild.answer) ||
+              (typeof rawChild.answerPreview === 'string' && rawChild.answerPreview) ||
+              '';
             let node = nodeMap.get(cid);
             if (!node) {
               node = {
                 childId: cid,
                 task: typeof rawChild.task === 'string' ? rawChild.task : '',
-                status: (rawChild.status as OrchestrationNodeStatus) || 'running',
-                answer: typeof rawChild.answer === 'string' ? rawChild.answer : undefined,
+                status: listedStatus ?? 'running',
+                answer: listedAnswer || undefined,
                 steers: [],
               };
               nodeMap.set(cid, node);
             } else {
               if (!node.task && rawChild.task) node.task = String(rawChild.task);
-              if (!node.answer && rawChild.answer) node.answer = String(rawChild.answer);
+              if (!node.answer && listedAnswer) node.answer = listedAnswer;
+              if (listedStatus) node.status = listedStatus;
             }
           }
         }
@@ -256,39 +343,7 @@ export function extractOrchestrationFlow(
     return null;
   }
 
-  const nodes = Array.from(nodeMap.values());
-  if (nodes.length === 0) return null;
-
-  const totalCount = nodes.length;
-  const completedCount = nodes.filter((n) => n.status === 'completed').length;
-  const runningCount = nodes.filter((n) => n.status === 'running' || n.status === 'pending').length;
-  const failedCount = nodes.filter((n) => n.status === 'failed').length;
-  const interruptedCount = nodes.filter((n) => n.status === 'interrupted').length;
-  const closedCount = nodes.filter((n) => n.status === 'closed').length;
-  const isAllCompleted = totalCount > 0 && completedCount === totalCount;
-  const hasActive = runningCount > 0;
-
-  let summaryCopy = '';
-  if (isAllCompleted) {
-    summaryCopy = `${completedCount}/${totalCount} 全部完成`;
-  } else if (hasActive) {
-    summaryCopy = `协同执行中 (${completedCount}/${totalCount} 完成)...`;
-  } else {
-    summaryCopy = `${completedCount} 完成 · ${totalCount - completedCount} 结束 (${totalCount} 个子任务)`;
-  }
-
-  return {
-    nodes,
-    totalCount,
-    completedCount,
-    runningCount,
-    failedCount,
-    interruptedCount,
-    closedCount,
-    isAllCompleted,
-    hasActive,
-    summaryCopy,
-  };
+  return buildOrchestrationFlow(Array.from(nodeMap.values()));
 }
 
 function actionsFromTimeline(blocks?: ReadonlyArray<{ type: string; actions?: unknown[] }>): ActionLike[] {
@@ -314,22 +369,32 @@ export function resolveLatestSessionOrchestrationFlow(input: {
   orchestrationChildrenByMessageId?: Record<string, ChildInfo[]>;
   timelineByMessageId?: Record<string, Array<{ type: string; actions?: unknown[] }>>;
   currentTurnTimeline?: Array<{ type: string; actions?: unknown[] }>;
+  /** 父回合仍在流式输出。结束后残留的 running 分支收成已停止。 */
+  turnActive?: boolean;
 }): OrchestrationFlowData | null {
+  const finish = (flow: OrchestrationFlowData | null, active: boolean) => {
+    if (!flow || flow.totalCount === 0) return null;
+    return active ? flow : settleStoppedOrchestration(flow);
+  };
+
   // 1. 优先实时回合
   const liveActions =
     input.currentTurnActions ?? actionsFromTimeline(input.currentTurnTimeline);
-  const liveFlow = extractOrchestrationFlow(liveActions, input.currentTurnChildren);
-  if (liveFlow && liveFlow.totalCount > 0) return liveFlow;
+  const liveFlow = finish(
+    extractOrchestrationFlow(liveActions, input.currentTurnChildren),
+    input.turnActive !== false,
+  );
+  if (liveFlow) return liveFlow;
 
-  // 2. 倒序历史回合
+  // 2. 倒序历史回合。落库的回合已经结束，残留 running 同样收成已停止。
   for (let i = input.messages.length - 1; i >= 0; i -= 1) {
     const id = input.messages[i].id;
     const actions =
       input.executedActionsByMessageId?.[id] ??
       actionsFromTimeline(input.timelineByMessageId?.[id]);
     const children = input.orchestrationChildrenByMessageId?.[id];
-    const flow = extractOrchestrationFlow(actions, children);
-    if (flow && flow.totalCount > 0) return flow;
+    const flow = finish(extractOrchestrationFlow(actions, children), false);
+    if (flow) return flow;
   }
 
   return null;

package/src/components/chat/prompt-chat-scope.ts

@@ -0,0 +1,33 @@
+/** Chat id from `#/agent/:chatId` (hash router) or `/agent/:chatId`. */
+export function chatIdFromLocation(location: { pathname: string; hash: string }): string | null {
+  const hashed = location.hash.startsWith('#') ? location.hash.slice(1) : '';
+  const raw = hashed || location.pathname;
+  const match = raw.match(/\/agent\/([^/?#]+)/);
+  if (!match?.[1]) return null;
+  try {
+    return decodeURIComponent(match[1]);
+  } catch {
+    return match[1];
+  }
+}
+
+/** Stamp an unscoped prompt with the chat open when it arrived. */
+export function bindPromptToActiveChat<T extends { chatId?: string }>(request: T): T {
+  if (request.chatId) return request;
+  const chatId = chatIdFromLocation(window.location);
+  if (!chatId) return request;
+  return { ...request, chatId };
+}
+
+/**
+ * A prompt with a chat id belongs only to that chat.
+ * A prompt without one stays visible only when the composer itself has no chat,
+ * so an older request is still answerable.
+ */
+export function promptVisibleInChat(
+  request: { chatId?: string },
+  chatId: string | null | undefined,
+): boolean {
+  if (!request.chatId) return !chatId;
+  return request.chatId === chatId;
+}

package/src/components/settings/AgentsSettingsPanel.tsx

@@ -5,6 +5,7 @@ import {
   LuPlus,
   LuTrash2,
 } from 'react-icons/lu';
+import { ConfirmDialog } from '@/components/ConfirmDialog';
 import { isElectron } from '@/lib/electron-bridge';
 import {
   archiveChatAgent,
@@ -22,7 +23,7 @@ import {
 /**
  * AgentsSettingsPanel — 智能体目录（列表 / 新建 / 编辑 / 归档）。
  *
- * 渲染在 `/settings?section=agents` 独立页。自定义智能体出现在输入框
+ * 渲染在 `/settings?section=plugins` 的智能体分类。自定义智能体出现在输入框
  * 上方的专家选择器里。内置智能体可改文案与能力，不能归档。
  *
  * 除文案外，每个智能体还持有真实生效的能力面（勾选技能 / 技能范围 /
@@ -91,7 +92,10 @@ export function AgentsSettingsPanel({
   const [capability, setCapability] = useState<AgentCapabilityDraft>(
     DEFAULT_CAPABILITY_DRAFT,
   );
-  const [confirmArchiveId, setConfirmArchiveId] = useState<string | null>(null);
+  const [pendingArchive, setPendingArchive] = useState<{
+    id: string;
+    name: string;
+  } | null>(null);
   const [archivingId, setArchivingId] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
 
@@ -179,17 +183,14 @@ export function AgentsSettingsPanel({
     }
   };
 
-  const handleArchive = async (agent: LocalChatAgent) => {
-    if (agent.isBuiltin) return;
-    if (confirmArchiveId !== agent.id) {
-      setConfirmArchiveId(agent.id);
-      return;
-    }
-    setArchivingId(agent.id);
+  const handleArchive = async () => {
+    if (!pendingArchive || archivingId === pendingArchive.id) return;
+    const id = pendingArchive.id;
+    setArchivingId(id);
     setError(null);
     try {
-      await archiveChatAgent(agent.id);
-      setConfirmArchiveId(null);
+      await archiveChatAgent(id);
+      setPendingArchive(null);
       await fetchAgents();
       await onCatalogChange?.();
     } catch (err) {
@@ -371,18 +372,12 @@ export function AgentsSettingsPanel({
                   {!agent.isBuiltin && (
                     <button
                       type="button"
-                      onClick={() => void handleArchive(agent)}
-                      disabled={archivingId === agent.id}
-                      className={`rounded-full p-1 transition-colors ${
-                        confirmArchiveId === agent.id
-                          ? 'bg-agent-destructive/10 text-agent-destructive hover:bg-agent-destructive/20'
-                          : 'text-agent-muted-foreground hover:bg-agent-muted hover:text-agent-destructive'
-                      }`}
-                      title={
-                        confirmArchiveId === agent.id
-                          ? '再次点击确认删除'
-                          : '删除'
+                      onClick={() =>
+                        setPendingArchive({ id: agent.id, name: agent.name })
                       }
+                      disabled={archivingId === agent.id}
+                      className="rounded-full p-1 text-agent-muted-foreground transition-colors hover:bg-agent-muted hover:text-agent-destructive"
+                      title="删除"
                       data-testid={`agent-archive-${agent.id}`}
                     >
                       {archivingId === agent.id ? (
@@ -407,6 +402,22 @@ export function AgentsSettingsPanel({
           {error}
         </div>
       )}
+      <ConfirmDialog
+        open={pendingArchive !== null}
+        title="删除智能体"
+        description={
+          pendingArchive
+            ? `确定删除「${pendingArchive.name}」？它会从专家选择器中移除，已有会话不受影响。`
+            : ''
+        }
+        pending={pendingArchive !== null && archivingId === pendingArchive.id}
+        onCancel={() => {
+          if (archivingId) return;
+          setPendingArchive(null);
+        }}
+        onConfirm={() => void handleArchive()}
+        testId="agent-archive-dialog"
+      />
     </div>
   );
 }