superun-ai-cli 0.1.1 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.en.md +25 -1
- package/README.md +25 -1
- package/dist/api/agent-command-api.d.ts +1 -1
- package/dist/api/agent-command-api.js +2 -1
- package/dist/api/agent-command-api.js.map +1 -1
- package/dist/commands/chat/message.js +1 -1
- package/dist/commands/chat/message.js.map +1 -1
- package/dist/commands/chat/state.js +3 -0
- package/dist/commands/chat/state.js.map +1 -1
- package/dist/commands/chat/style.js +7 -1
- package/dist/commands/chat/style.js.map +1 -1
- package/dist/commands/chat/wait.js +2 -1
- package/dist/commands/chat/wait.js.map +1 -1
- package/dist/commands/shared.d.ts +1 -0
- package/dist/commands/shared.js +1 -0
- package/dist/commands/shared.js.map +1 -1
- package/dist/contracts/cli-output.d.ts +52 -0
- package/dist/conversation/feature-progress.d.ts +2 -0
- package/dist/conversation/feature-progress.js +66 -0
- package/dist/conversation/feature-progress.js.map +1 -0
- package/dist/conversation/next-actions.d.ts +1 -1
- package/dist/conversation/next-actions.js +49 -10
- package/dist/conversation/next-actions.js.map +1 -1
- package/dist/conversation/session-waiter.d.ts +3 -0
- package/dist/conversation/session-waiter.js +24 -3
- package/dist/conversation/session-waiter.js.map +1 -1
- package/dist/conversation/task-progress-reader.d.ts +12 -0
- package/dist/conversation/task-progress-reader.js +232 -0
- package/dist/conversation/task-progress-reader.js.map +1 -0
- package/dist/conversation/task-progress.d.ts +13 -0
- package/dist/conversation/task-progress.js +228 -0
- package/dist/conversation/task-progress.js.map +1 -0
- package/dist/interactions/parsers/style-selection.d.ts +4 -0
- package/dist/interactions/parsers/style-selection.js +8 -0
- package/dist/interactions/parsers/style-selection.js.map +1 -1
- package/dist/output/writer.d.ts +4 -0
- package/dist/output/writer.js +19 -1
- package/dist/output/writer.js.map +1 -1
- package/dist/runtime.d.ts +9 -2
- package/dist/runtime.js +124 -18
- package/dist/runtime.js.map +1 -1
- package/package.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next-actions.js","sourceRoot":"","sources":["../../src/conversation/next-actions.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,
|
|
1
|
+
{"version":3,"file":"next-actions.js","sourceRoot":"","sources":["../../src/conversation/next-actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export type WaitOptions = {
|
|
|
7
7
|
timeout?: number;
|
|
8
8
|
interval?: number;
|
|
9
9
|
messageId?: string;
|
|
10
|
+
progressRevision?: string;
|
|
10
11
|
/** 写请求返回的消息须先进入轮次模型，避免把旧规划当作本次结果。 */
|
|
11
12
|
requiredMessageId?: string;
|
|
12
13
|
/** 排队响应没有新消息 ID 时，仍须等到旧轮次发生切换。 */
|
|
@@ -22,6 +23,8 @@ export declare class SessionWaiter {
|
|
|
22
23
|
command: AgentCommandApi;
|
|
23
24
|
load: (sessionId: string) => Promise<SessionView>;
|
|
24
25
|
inspect: (view: SessionView, styleTarget?: StyleWaitTarget) => Promise<CreationResult>;
|
|
26
|
+
/** 只展示过程，不结束等待，也不参与整体状态判断。 */
|
|
27
|
+
onProgress?: (result: CreationResult) => void;
|
|
25
28
|
signal?: AbortSignal;
|
|
26
29
|
});
|
|
27
30
|
wait(sessionId: string, options?: WaitOptions): Promise<CreationResult>;
|
|
@@ -5,6 +5,15 @@ import { pendingAutomaticTools } from '../auto-tools/registry.js';
|
|
|
5
5
|
import { replyReadLogs } from '../auto-tools/read-logs.js';
|
|
6
6
|
import { CliError } from '../output/exit-codes.js';
|
|
7
7
|
import { pendingTool } from '../interactions/context.js';
|
|
8
|
+
import { readyStyleChoices } from '../interactions/parsers/style-selection.js';
|
|
9
|
+
import { submittedTaskProgress } from './task-progress.js';
|
|
10
|
+
function hasReadyStylePreview(result, styleTarget) {
|
|
11
|
+
return (result.state === 'RUNNING' &&
|
|
12
|
+
!!result.cursor?.branchAnchor &&
|
|
13
|
+
(!styleTarget ||
|
|
14
|
+
styleTarget.choiceIds.every((id) => result.choices?.some((choice) => choice.choiceId === id))) &&
|
|
15
|
+
readyStyleChoices(result.choices ?? []).length > 0);
|
|
16
|
+
}
|
|
8
17
|
export function applySnapshot(view, pipeline) {
|
|
9
18
|
const messages = new Map(view.pipeline.messages.map((message) => [message.messageId, message]));
|
|
10
19
|
for (const message of pipeline.messages)
|
|
@@ -62,6 +71,7 @@ export class SessionWaiter {
|
|
|
62
71
|
let etag, target = options.messageId, unchanged = 0;
|
|
63
72
|
const replied = new Set(), messages = new Map();
|
|
64
73
|
const progress = new Map();
|
|
74
|
+
let progressRevision = options.progressRevision;
|
|
65
75
|
let responseObserved = !options.requiredMessageId && !options.previousMessageId;
|
|
66
76
|
const inspect = async () => {
|
|
67
77
|
if (!responseObserved) {
|
|
@@ -85,6 +95,7 @@ export class SessionWaiter {
|
|
|
85
95
|
messages: [],
|
|
86
96
|
progress: [],
|
|
87
97
|
interactions: [],
|
|
98
|
+
taskProgress: submittedTaskProgress(sessionId, options.requiredMessageId ?? options.previousMessageId ?? sessionId),
|
|
88
99
|
};
|
|
89
100
|
return this.dependencies.inspect(view, options.styleTarget);
|
|
90
101
|
};
|
|
@@ -109,8 +120,9 @@ export class SessionWaiter {
|
|
|
109
120
|
return { ...value, interactions, state: interactions.length ? 'NEEDS_INPUT' : 'RUNNING' };
|
|
110
121
|
};
|
|
111
122
|
result = suppressSubmitted(result);
|
|
112
|
-
if (!['RUNNING', 'QUEUED'].includes(result.state)
|
|
113
|
-
|
|
123
|
+
if (!['RUNNING', 'QUEUED'].includes(result.state) ||
|
|
124
|
+
hasReadyStylePreview(result, options.styleTarget)) {
|
|
125
|
+
// 终态、交互或单个风格就绪时重读全量，防止漏掉新轮或服务端刚完成的交接。
|
|
114
126
|
view = await this.dependencies.load(sessionId);
|
|
115
127
|
result = suppressSubmitted(await inspect());
|
|
116
128
|
}
|
|
@@ -118,7 +130,12 @@ export class SessionWaiter {
|
|
|
118
130
|
messages.set(item.id, item);
|
|
119
131
|
for (const item of result.progress)
|
|
120
132
|
progress.set(item.id, item);
|
|
121
|
-
if (
|
|
133
|
+
if (result.taskProgress) {
|
|
134
|
+
result.taskProgress.changed = result.taskProgress.revision !== progressRevision;
|
|
135
|
+
result.cursor = { ...result.cursor, progressRevision: result.taskProgress.revision };
|
|
136
|
+
}
|
|
137
|
+
// 单个方案可预览就交还进度，调用方按 QUERY_STYLES 继续查询，不停止远端生成。
|
|
138
|
+
if (!['RUNNING', 'QUEUED'].includes(result.state) || hasReadyStylePreview(result, options.styleTarget))
|
|
122
139
|
return {
|
|
123
140
|
...result,
|
|
124
141
|
messages: [...messages.values()],
|
|
@@ -133,6 +150,10 @@ export class SessionWaiter {
|
|
|
133
150
|
waitTimedOut: true,
|
|
134
151
|
cursor: { ...result.cursor, etag },
|
|
135
152
|
};
|
|
153
|
+
if (result.taskProgress && this.dependencies.onProgress) {
|
|
154
|
+
this.dependencies.onProgress(result);
|
|
155
|
+
progressRevision = result.taskProgress.revision;
|
|
156
|
+
}
|
|
136
157
|
const hint = view.pipeline.pollingHint;
|
|
137
158
|
const interval = Math.max((options.interval ?? 0) * 1000, hint?.nextPollAfterMs ?? (unchanged ? 5000 : 2000));
|
|
138
159
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-waiter.js","sourceRoot":"","sources":["../../src/conversation/session-waiter.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAK3D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"session-waiter.js","sourceRoot":"","sources":["../../src/conversation/session-waiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { ApiClient } from '../transport/api-client.js';
|
|
2
|
+
import type { Choice, CreationResult, Interaction, TaskProgressSnapshot } from '../contracts/cli-output.js';
|
|
3
|
+
import type { SessionView } from '../contracts/node-wire.js';
|
|
4
|
+
export declare class TaskProgressReader {
|
|
5
|
+
private readonly client;
|
|
6
|
+
private readonly cache;
|
|
7
|
+
private readonly toolUsage;
|
|
8
|
+
constructor(client: ApiClient);
|
|
9
|
+
completionSummary(sessionId: string, messageId?: string): CreationResult['toolUsage'];
|
|
10
|
+
private cached;
|
|
11
|
+
read(view: SessionView, choices: Array<Choice>, interactions?: Array<Interaction>): Promise<TaskProgressSnapshot>;
|
|
12
|
+
}
|
|
@@ -0,0 +1,232 @@
|
|
|
1
|
+
/** 独立读取全部后台任务，避免父消息 ETag 不变时漏掉进度。@author xiuyu.yi */
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { parseWire, recentlySchema } from '../contracts/node-wire.js';
|
|
4
|
+
import { enabled, text } from '../contracts/value.js';
|
|
5
|
+
import { CliError } from '../output/exit-codes.js';
|
|
6
|
+
import { currentRound, roundMessage } from './round-selector.js';
|
|
7
|
+
import { projectFeatureTasks } from './feature-progress.js';
|
|
8
|
+
import { activeTask, messageTaskStatus, ownerId, projectMessageTasks, projectStyleTasks, roundOwner, roundProgressDetail, taskProgressSnapshot, workBlockStatus, } from './task-progress.js';
|
|
9
|
+
const taskSchema = z.object({
|
|
10
|
+
taskKey: z.string(),
|
|
11
|
+
agentId: z.string().nullish(),
|
|
12
|
+
childSessionId: z.string().nullish(),
|
|
13
|
+
parentReplyMessageId: z.string().nullish(),
|
|
14
|
+
taskTitle: z.string().nullish(),
|
|
15
|
+
ownerUserId: z.union([z.string(), z.number()]).nullish(),
|
|
16
|
+
status: z.number().nullish(),
|
|
17
|
+
associationStatus: z.number().nullish(),
|
|
18
|
+
});
|
|
19
|
+
const discoverySchema = z.object({
|
|
20
|
+
tasks: z.array(taskSchema),
|
|
21
|
+
truncated: z.boolean(),
|
|
22
|
+
causalAssociations: z
|
|
23
|
+
.array(z.object({ childSessionId: z.string().nullish(), associationStatus: z.number().nullish() }))
|
|
24
|
+
.optional(),
|
|
25
|
+
});
|
|
26
|
+
const REFRESH_MS = 2_000;
|
|
27
|
+
export class TaskProgressReader {
|
|
28
|
+
client;
|
|
29
|
+
cache = new Map();
|
|
30
|
+
toolUsage = new Map();
|
|
31
|
+
constructor(client) {
|
|
32
|
+
this.client = client;
|
|
33
|
+
}
|
|
34
|
+
completionSummary(sessionId, messageId) {
|
|
35
|
+
const usage = this.toolUsage.get(sessionId);
|
|
36
|
+
return messageId && usage?.messageId === messageId ? usage.summary : undefined;
|
|
37
|
+
}
|
|
38
|
+
cached(key, read) {
|
|
39
|
+
const cached = this.cache.get(key);
|
|
40
|
+
if (cached && cached.expires > Date.now())
|
|
41
|
+
return cached.value;
|
|
42
|
+
// 仅保留短期读取结果；失败不导致每一拍重复请求。
|
|
43
|
+
for (const [id, entry] of this.cache)
|
|
44
|
+
if (entry.expires <= Date.now())
|
|
45
|
+
this.cache.delete(id);
|
|
46
|
+
const value = read();
|
|
47
|
+
this.cache.set(key, { expires: Date.now() + REFRESH_MS, value });
|
|
48
|
+
return value;
|
|
49
|
+
}
|
|
50
|
+
async read(view, choices, interactions = []) {
|
|
51
|
+
if (this.client.signal?.aborted)
|
|
52
|
+
throw new CliError('INTERRUPTED', '已停止本地进度查询');
|
|
53
|
+
const sessionId = view.session.sessionId;
|
|
54
|
+
this.toolUsage.delete(sessionId);
|
|
55
|
+
const current = currentRound(view);
|
|
56
|
+
const currentUser = ownerId(view.pipeline.render?.currentUserId);
|
|
57
|
+
const warnings = [];
|
|
58
|
+
const tasks = projectMessageTasks(view, interactions);
|
|
59
|
+
const childTasks = new Map();
|
|
60
|
+
for (const round of view.pipeline.render?.rounds ?? []) {
|
|
61
|
+
for (const block of round.agentItems) {
|
|
62
|
+
if (block.variant !== 'work_block')
|
|
63
|
+
continue;
|
|
64
|
+
const agentId = text(block.payload.agentId);
|
|
65
|
+
if (!agentId)
|
|
66
|
+
continue;
|
|
67
|
+
const status = workBlockStatus(block.payload.status);
|
|
68
|
+
if (!activeTask(status) && status !== 'unknown' && round.roundId !== current?.roundId)
|
|
69
|
+
continue;
|
|
70
|
+
const owner = roundOwner(view, round);
|
|
71
|
+
const own = currentUser !== undefined && owner === currentUser;
|
|
72
|
+
childTasks.set(agentId, {
|
|
73
|
+
owner,
|
|
74
|
+
parent: round.anchorUserMessageId,
|
|
75
|
+
child: agentId,
|
|
76
|
+
item: {
|
|
77
|
+
id: `subtask:${agentId}`,
|
|
78
|
+
kind: own ? 'subtask' : 'other-member',
|
|
79
|
+
title: own ? text(block.payload.taskTitle) || '后台任务' : '其他成员或归属待确认的后台任务',
|
|
80
|
+
status,
|
|
81
|
+
agentId,
|
|
82
|
+
roundId: round.roundId,
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
try {
|
|
88
|
+
const discovery = await this.cached(`tasks:${sessionId}`, async () => parseWire(discoverySchema, await this.client.call('/web-api/conversation-v2/subagent-message-stream-discovery', {
|
|
89
|
+
parentSessionId: sessionId,
|
|
90
|
+
previewVersionId: 0,
|
|
91
|
+
includeTaskTitle: true,
|
|
92
|
+
})));
|
|
93
|
+
if (discovery.truncated)
|
|
94
|
+
warnings.push('后台任务列表尚未完整返回，已展示当前可确认的任务。');
|
|
95
|
+
const seen = new Map();
|
|
96
|
+
const removed = new Set();
|
|
97
|
+
for (const association of discovery.causalAssociations ?? [])
|
|
98
|
+
if (association.associationStatus === 1 && association.childSessionId)
|
|
99
|
+
removed.add(association.childSessionId);
|
|
100
|
+
for (const task of discovery.tasks) {
|
|
101
|
+
const id = task.agentId || task.childSessionId || task.taskKey;
|
|
102
|
+
if (task.associationStatus === 1) {
|
|
103
|
+
removed.add(id);
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
const previous = seen.get(id);
|
|
107
|
+
const conflict = previous &&
|
|
108
|
+
(ownerId(previous.ownerUserId) !== ownerId(task.ownerUserId) ||
|
|
109
|
+
previous.parentReplyMessageId !== task.parentReplyMessageId);
|
|
110
|
+
seen.set(id, conflict ? { ...task, ownerUserId: null } : task);
|
|
111
|
+
if (conflict)
|
|
112
|
+
warnings.push('部分任务归属不明确，仅展示其状态。');
|
|
113
|
+
const status = messageTaskStatus(task.status);
|
|
114
|
+
const sameRound = task.parentReplyMessageId === current?.anchorUserMessageId;
|
|
115
|
+
if (!activeTask(status) && status !== 'unknown' && !sameRound) {
|
|
116
|
+
childTasks.delete(id);
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
const owner = conflict ? undefined : ownerId(task.ownerUserId);
|
|
120
|
+
const own = currentUser !== undefined && owner === currentUser;
|
|
121
|
+
childTasks.set(id, {
|
|
122
|
+
owner,
|
|
123
|
+
parent: task.parentReplyMessageId ?? undefined,
|
|
124
|
+
child: task.childSessionId || task.agentId || undefined,
|
|
125
|
+
item: {
|
|
126
|
+
id: `subtask:${id}`,
|
|
127
|
+
kind: own ? 'subtask' : 'other-member',
|
|
128
|
+
title: own ? task.taskTitle?.trim() || '后台任务' : '其他成员或归属待确认的后台任务',
|
|
129
|
+
status,
|
|
130
|
+
agentId: task.agentId ?? undefined,
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
for (const [id, entry] of childTasks)
|
|
135
|
+
if (removed.has(id) || (entry.child && removed.has(entry.child)))
|
|
136
|
+
childTasks.delete(id);
|
|
137
|
+
}
|
|
138
|
+
catch {
|
|
139
|
+
if (this.client.signal?.aborted)
|
|
140
|
+
throw new CliError('INTERRUPTED', '已停止本地进度查询');
|
|
141
|
+
warnings.push('后台任务独立进度暂不可用，当前使用消息中已有的任务状态。');
|
|
142
|
+
}
|
|
143
|
+
// 所有活跃子任务都读取，但限制同时发出的请求数量，避免并发任务多时压满接口。
|
|
144
|
+
const children = [...childTasks.values()];
|
|
145
|
+
let offset = 0;
|
|
146
|
+
await Promise.all(Array.from({ length: Math.min(4, children.length) }, async () => {
|
|
147
|
+
while (offset < children.length) {
|
|
148
|
+
const entry = children[offset++];
|
|
149
|
+
if (!entry.child ||
|
|
150
|
+
entry.owner !== currentUser ||
|
|
151
|
+
!currentUser ||
|
|
152
|
+
(!activeTask(entry.item.status) && entry.item.status !== 'unknown'))
|
|
153
|
+
continue;
|
|
154
|
+
try {
|
|
155
|
+
const child = await this.cached(`child:${entry.child}`, async () => parseWire(recentlySchema, await this.client.call('/web-api/conversation-v2/subagent-recently', {
|
|
156
|
+
sessionId: entry.child,
|
|
157
|
+
previewVersionId: 0,
|
|
158
|
+
withAttachment: false,
|
|
159
|
+
withAllAttachmentContent: false,
|
|
160
|
+
})));
|
|
161
|
+
const childView = { ...child, extra: {} };
|
|
162
|
+
const round = currentRound(childView);
|
|
163
|
+
if (!round)
|
|
164
|
+
continue;
|
|
165
|
+
const message = roundMessage(childView, round);
|
|
166
|
+
let status = messageTaskStatus(message?.status);
|
|
167
|
+
if (child.session.status === -1 || round.status === 'failed')
|
|
168
|
+
status = 'failed';
|
|
169
|
+
else if (child.session.status === 3 && round.status === 'completed')
|
|
170
|
+
status = 'completed';
|
|
171
|
+
else if (child.session.status === 2)
|
|
172
|
+
status = 'interrupted';
|
|
173
|
+
else if (status === 'completed')
|
|
174
|
+
status = 'waiting';
|
|
175
|
+
entry.item = {
|
|
176
|
+
...entry.item,
|
|
177
|
+
status,
|
|
178
|
+
messageId: message?.messageId,
|
|
179
|
+
...roundProgressDetail(childView, round),
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
catch {
|
|
183
|
+
if (this.client.signal?.aborted)
|
|
184
|
+
throw new CliError('INTERRUPTED', '已停止本地进度查询');
|
|
185
|
+
warnings.push('部分后台任务的详细进度暂不可用，其任务状态仍按列表展示。');
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}));
|
|
189
|
+
// 与 Glow 完成气泡同源，只取当前轮 activity.summary.toolCount。
|
|
190
|
+
// 子任务有自己的工具摘要，不能累加到主任务气泡上。
|
|
191
|
+
if (current && currentUser && roundOwner(view, current) === currentUser) {
|
|
192
|
+
const toolCount = roundProgressDetail(view, current).activity?.toolCount;
|
|
193
|
+
const complete = toolCount !== undefined;
|
|
194
|
+
this.toolUsage.set(sessionId, {
|
|
195
|
+
messageId: roundMessage(view, current)?.messageId,
|
|
196
|
+
summary: {
|
|
197
|
+
...(toolCount !== undefined ? { toolCount } : {}),
|
|
198
|
+
complete,
|
|
199
|
+
markdown: complete
|
|
200
|
+
? `已生成：${toolCount} 次工具调用`
|
|
201
|
+
: '本轮工具调用次数暂不可用（统计数据未完整返回）。',
|
|
202
|
+
},
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
tasks.push(...children.map((entry) => entry.item), ...projectStyleTasks(choices));
|
|
206
|
+
if (!currentUser && tasks.length)
|
|
207
|
+
warnings.push('当前用户归属信息未返回，部分任务仅展示状态。');
|
|
208
|
+
const extra = roundMessage(view, current)?.roundExtra ?? {};
|
|
209
|
+
// 仅在当前用户的已确认研发阶段读取内部进度；咨询、风格和归属未知时保留原展示。
|
|
210
|
+
if (current &&
|
|
211
|
+
currentUser &&
|
|
212
|
+
roundOwner(view, current) === currentUser &&
|
|
213
|
+
enabled(extra.startDevelopment) &&
|
|
214
|
+
enabled(extra.architecturePlanApproved)) {
|
|
215
|
+
try {
|
|
216
|
+
const features = await this.cached(`features:${sessionId}`, async () => {
|
|
217
|
+
const [featureData, todoData] = await Promise.all(['internal/features.json', 'internal/todos.json'].map((name) => this.client.call('/api/uxa-center/agent/AgentQuery/queryAttachment', { sessionId, name })));
|
|
218
|
+
return projectFeatureTasks(sessionId, featureData, todoData);
|
|
219
|
+
});
|
|
220
|
+
if (features.length)
|
|
221
|
+
return taskProgressSnapshot(sessionId, features, warnings);
|
|
222
|
+
}
|
|
223
|
+
catch {
|
|
224
|
+
if (this.client.signal?.aborted)
|
|
225
|
+
throw new CliError('INTERRUPTED', '已停止本地进度查询');
|
|
226
|
+
warnings.push('功能步骤暂不可用，当前显示执行状态，不能据此判断步骤完成情况。');
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
return taskProgressSnapshot(sessionId, tasks, warnings);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
//# sourceMappingURL=task-progress-reader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-progress-reader.js","sourceRoot":"","sources":["../../src/conversation/task-progress-reader.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,OAAO,EACP,mBAAmB,EACnB,iBAAiB,EACjB,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAC7B,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IACpC,oBAAoB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAC1C,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAC/B,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE;IACxD,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAC5B,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;CACxC,CAAC,CAAC;AACH,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;IAC1B,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,kBAAkB,EAAE,CAAC;SAClB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;SAClG,QAAQ,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,KAAK,CAAC;AAEzB,MAAM,OAAO,kBAAkB;IAMA;IALZ,KAAK,GAAG,IAAI,GAAG,EAAwD,CAAC;IACxE,SAAS,GAAG,IAAI,GAAG,EAGjC,CAAC;IACJ,YAA6B,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;IAAG,CAAC;IAElD,iBAAiB,CAAC,SAAiB,EAAE,SAAkB;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,SAAS,IAAI,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACjF,CAAC;IAEO,MAAM,CAAI,GAAW,EAAE,IAAsB;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE;YAAE,OAAO,MAAM,CAAC,KAAmB,CAAC;QAC7E,0BAA0B;QAC1B,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK;YAAE,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE;gBAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7F,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QACjE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,IAAI,CACR,IAAiB,EACjB,OAAsB,EACtB,eAAmC,EAAE;QAErC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO;YAAE,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAChF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QACzC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAkB,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,IAAI,GAAG,EAGvB,CAAC;QACJ,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,CAAC;YACvD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,OAAO,KAAK,YAAY;oBAAE,SAAS;gBAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC5C,IAAI,CAAC,OAAO;oBAAE,SAAS;gBACvB,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACrD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,EAAE,OAAO;oBAAE,SAAS;gBAChG,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACtC,MAAM,GAAG,GAAG,WAAW,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC;gBAC/D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE;oBACtB,KAAK;oBACL,MAAM,EAAE,KAAK,CAAC,mBAAmB;oBACjC,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE;wBACJ,EAAE,EAAE,WAAW,OAAO,EAAE;wBACxB,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;wBACtC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,iBAAiB;wBACxE,MAAM;wBACN,OAAO;wBACP,OAAO,EAAE,KAAK,CAAC,OAAO;qBACvB;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,SAAS,EAAE,EAAE,KAAK,IAAI,EAAE,CACnE,SAAS,CACP,eAAe,EACf,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4DAA4D,EAAE;gBACnF,eAAe,EAAE,SAAS;gBAC1B,gBAAgB,EAAE,CAAC;gBACnB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CACH,CACF,CAAC;YACF,IAAI,SAAS,CAAC,SAAS;gBAAE,QAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACpE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAwB,CAAC;YAC7C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;YAClC,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,kBAAkB,IAAI,EAAE;gBAC1D,IAAI,WAAW,CAAC,iBAAiB,KAAK,CAAC,IAAI,WAAW,CAAC,cAAc;oBACnE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YAC5C,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;gBACnC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC;gBAC/D,IAAI,IAAI,CAAC,iBAAiB,KAAK,CAAC,EAAE,CAAC;oBACjC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBAChB,SAAS;gBACX,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC9B,MAAM,QAAQ,GACZ,QAAQ;oBACR,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC;wBAC1D,QAAQ,CAAC,oBAAoB,KAAK,IAAI,CAAC,oBAAoB,CAAC,CAAC;gBACjE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC/D,IAAI,QAAQ;oBAAE,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBACjD,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,KAAK,OAAO,EAAE,mBAAmB,CAAC;gBAC7E,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;oBAC9D,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACtB,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC/D,MAAM,GAAG,GAAG,WAAW,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC;gBAC/D,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE;oBACjB,KAAK;oBACL,MAAM,EAAE,IAAI,CAAC,oBAAoB,IAAI,SAAS;oBAC9C,KAAK,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,IAAI,SAAS;oBACvD,IAAI,EAAE;wBACJ,EAAE,EAAE,WAAW,EAAE,EAAE;wBACnB,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;wBACtC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,iBAAiB;wBACjE,MAAM;wBACN,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,SAAS;qBACnC;iBACF,CAAC,CAAC;YACL,CAAC;YACD,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,UAAU;gBAClC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5F,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO;gBAAE,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAChF,QAAQ,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAChD,CAAC;QACD,wCAAwC;QACxC,MAAM,QAAQ,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1C,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;YAC9D,OAAO,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAE,CAAC;gBAClC,IACE,CAAC,KAAK,CAAC,KAAK;oBACZ,KAAK,CAAC,KAAK,KAAK,WAAW;oBAC3B,CAAC,WAAW;oBACZ,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC;oBAEnE,SAAS;gBACX,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,IAAI,EAAE,CACjE,SAAS,CACP,cAAc,EACd,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,EAAE;wBACnE,SAAS,EAAE,KAAK,CAAC,KAAK;wBACtB,gBAAgB,EAAE,CAAC;wBACnB,cAAc,EAAE,KAAK;wBACrB,wBAAwB,EAAE,KAAK;qBAChC,CAAC,CACH,CACF,CAAC;oBACF,MAAM,SAAS,GAAgB,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;oBACvD,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;oBACtC,IAAI,CAAC,KAAK;wBAAE,SAAS;oBACrB,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBAC/C,IAAI,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBAChD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ;wBAAE,MAAM,GAAG,QAAQ,CAAC;yBAC3E,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW;wBAAE,MAAM,GAAG,WAAW,CAAC;yBACrF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;wBAAE,MAAM,GAAG,aAAa,CAAC;yBACvD,IAAI,MAAM,KAAK,WAAW;wBAAE,MAAM,GAAG,SAAS,CAAC;oBACpD,KAAK,CAAC,IAAI,GAAG;wBACX,GAAG,KAAK,CAAC,IAAI;wBACb,MAAM;wBACN,SAAS,EAAE,OAAO,EAAE,SAAS;wBAC7B,GAAG,mBAAmB,CAAC,SAAS,EAAE,KAAK,CAAC;qBACzC,CAAC;gBACJ,CAAC;gBAAC,MAAM,CAAC;oBACP,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO;wBAAE,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;oBAChF,QAAQ,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,kDAAkD;QAClD,2BAA2B;QAC3B,IAAI,OAAO,IAAI,WAAW,IAAI,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,WAAW,EAAE,CAAC;YACxE,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC;YACzE,MAAM,QAAQ,GAAG,SAAS,KAAK,SAAS,CAAC;YACzC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE;gBAC5B,SAAS,EAAE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,SAAS;gBACjD,OAAO,EAAE;oBACP,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjD,QAAQ;oBACR,QAAQ,EAAE,QAAQ;wBAChB,CAAC,CAAC,OAAO,SAAS,QAAQ;wBAC1B,CAAC,CAAC,0BAA0B;iBAC/B;aACF,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QAClF,IAAI,CAAC,WAAW,IAAI,KAAK,CAAC,MAAM;YAAE,QAAQ,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC1E,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC;QAC5D,yCAAyC;QACzC,IACE,OAAO;YACP,WAAW;YACX,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,WAAW;YACzC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,EACvC,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,SAAS,EAAE,EAAE,KAAK,IAAI,EAAE;oBACrE,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/C,CAAC,wBAAwB,EAAE,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kDAAkD,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAC1F,CACF,CAAC;oBACF,OAAO,mBAAmB,CAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;gBAC/D,CAAC,CAAC,CAAC;gBACH,IAAI,QAAQ,CAAC,MAAM;oBAAE,OAAO,oBAAoB,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAClF,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO;oBAAE,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;gBAChF,QAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QACD,OAAO,oBAAoB,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;CACF"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { Choice, Interaction, TaskProgressItem, TaskProgressSnapshot, TaskProgressStatus } from '../contracts/cli-output.js';
|
|
2
|
+
import type { NodeRound, SessionView } from '../contracts/node-wire.js';
|
|
3
|
+
export declare function activeTask(status: TaskProgressStatus): boolean;
|
|
4
|
+
export declare function ownerId(value: unknown): string | undefined;
|
|
5
|
+
export declare function roundOwner(view: SessionView, round: NodeRound): string | undefined;
|
|
6
|
+
export declare function messageTaskStatus(status: unknown): TaskProgressStatus;
|
|
7
|
+
export declare function workBlockStatus(status: unknown): TaskProgressStatus;
|
|
8
|
+
/** 叙述优先；冷启动状态只取当前提示，不把轮播候选当成已执行的阶段。 */
|
|
9
|
+
export declare function roundProgressDetail(view: SessionView, round: NodeRound): Pick<TaskProgressItem, 'detail' | 'activity'>;
|
|
10
|
+
export declare function projectMessageTasks(view: SessionView, interactions?: Array<Interaction>): Array<TaskProgressItem>;
|
|
11
|
+
export declare function projectStyleTasks(choices: Array<Choice>): Array<TaskProgressItem>;
|
|
12
|
+
export declare function taskProgressSnapshot(sessionId: string, tasks: Array<TaskProgressItem>, warnings?: Array<string>): TaskProgressSnapshot;
|
|
13
|
+
export declare function submittedTaskProgress(sessionId: string, id: string, title?: string): TaskProgressSnapshot;
|