mirivlad/ducklm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify tool approval chat flow

Browse Source
This commit is contained in:
mirivlad
2026-05-21 23:06:24 +08:00
parent 6f58df82c9
commit 10131cca48
4 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
duck_core/api.py
-14
View File
@@ -508,13 +508,6 @@ def create_app() -> FastAPI:
)
messages = await runtime.context_builder.build_async_messages(task)
tool_observations = [tool_observation]
if approval.decision != "deny" and not has_password_request(tool_observations):
tool_observations = await runtime._run_action_loop(
task_id,
messages,
task.workspace,
initial_observations=tool_observations,
)
async for tool_event in emit_tool_events(task_id, continued_event.sequence):
yield tool_event
if has_password_request(tool_observations):
@@ -696,13 +689,6 @@ def create_app() -> FastAPI:
)
messages = await runtime.context_builder.build_async_messages(task)
tool_observations = [tool_observation]
if not has_password_request(tool_observations):
tool_observations = await runtime._run_action_loop(
task_id,
messages,
task.workspace,
initial_observations=tool_observations,
)
async for tool_event in emit_tool_events(task_id, continued_event.sequence):
yield tool_event
if has_password_request(tool_observations):
duck_core/web/static/app.js
+26 -18
View File
@@ -175,35 +175,39 @@ function formatToolCommand(tool, args) {
}
function formatToolStart(tool, args) {
const lines = [formatToolCommand(tool, args)];
const serializedArgs = JSON.stringify(args || {}, null, 2);
if (serializedArgs !== "{}") lines.push(serializedArgs);
return lines.join("\n");
return formatToolCommand(tool, args);
}
function appendToolTerminal(article, eventPayload) {
const paragraph = article?.querySelector("p");
const payload = eventPayload.payload || eventPayload;
const existing = findToolTerminal(article, payload.index);
if (existing) return existing;
const terminal = createToolTerminal(eventPayload);
paragraph?.before(terminal);
document.querySelector("#messages").scrollTop = document.querySelector("#messages").scrollHeight;
return terminal;
}
function findToolTerminal(article, index) {
return article?.querySelector(`.tool-terminal[data-tool-index="${index || ""}"]`);
}
function updateToolTerminal(article, eventPayload) {
const payload = eventPayload.payload || eventPayload;
const terminal = article?.querySelector(`.tool-terminal[data-tool-index="${payload.index || ""}"]`);
const terminal = findToolTerminal(article, payload.index);
const body = terminal?.querySelector(".tool-terminal-body");
const status = terminal?.querySelector(".tool-terminal-status");
const result = payload.result || {};
if (!body || !status) return;
terminal.classList.toggle("is-error", !result.ok);
terminal.classList.remove("is-waiting");
status.textContent = result.ok ? "ok" : "error";
const parts = [body.textContent.trim()];
const title = terminal.querySelector(".tool-terminal-title")?.textContent || body.textContent.trim();
const parts = [title];
if (result.output) parts.push("\nstdout\n" + result.output.trimEnd());
if (result.error) parts.push("\nstderr\n" + result.error.trimEnd());
if (result.metadata && Object.keys(result.metadata).length) {
parts.push("\nmetadata\n" + JSON.stringify(result.metadata, null, 2));
}
body.textContent = parts.join("\n");
document.querySelector("#messages").scrollTop = document.querySelector("#messages").scrollHeight;
}
@@ -211,14 +215,13 @@ function updateToolTerminal(article, eventPayload) {
function appendApprovalTerminal(article, eventPayload) {
const payload = eventPayload.payload || eventPayload;
const action = payload.action || {};
appendToolTerminal(article, {
const terminal = appendToolTerminal(article, {
payload: {
index: payload.index,
tool: payload.tool,
args: action.args || {},
},
});
const terminal = article?.querySelector(`.tool-terminal[data-tool-index="${payload.index || ""}"]`);
const body = terminal?.querySelector(".tool-terminal-body");
const status = terminal?.querySelector(".tool-terminal-status");
const command = formatToolCommand(action.tool || payload.tool, action.args || {});
@@ -228,14 +231,15 @@ function appendApprovalTerminal(article, eventPayload) {
if (status) status.textContent = "approval";
if (body) {
body.textContent = [
body.textContent,
"",
"approval required",
command,
"",
"Требуется разрешение на выполнение.",
payload.reason || "",
].filter(Boolean).join("\n");
}
terminal?.append(createInlineApprovalActions(payload.approval_id, command));
if (!terminal?.querySelector(".tool-approval-actions")) {
terminal?.append(createInlineApprovalActions(payload.approval_id, command));
}
}
function appendPasswordPrompt(article, eventPayload) {
@@ -318,9 +322,13 @@ async function resolveInlineApproval(button) {
const decision = action === "deny" ? "denied" : "allowed";
terminal.classList.toggle("is-error", action === "deny");
terminal.classList.remove("is-waiting");
if (status) status.textContent = decision;
if (body) body.textContent = `${command}\n\n${decision}: ${humanApprovalDecision(action)}`;
terminal.classList.toggle("is-waiting", action !== "deny");
if (status) status.textContent = action === "deny" ? decision : "running";
if (body) {
body.textContent = action === "deny"
? `${command}\n\n${decision}: ${humanApprovalDecision(action)}`
: `${command}\n\nРазрешено. Выполняю команду...`;
}
actions?.remove();
if (taskId) {
await continueAfterInlineApproval(terminal.closest(".message"), taskId, approvalId);