Skip to content

Revert to promise-based waiting for pattern tool results #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2025
Merged

Revert to promise-based waiting for pattern tool results #1887

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c04845d
Revert to promise-based waiting for pattern tool results
bfollington Oct 8, 2025
277b34f
Format pass
bfollington Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions packages/runner/src/builtins/llm-dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,8 @@ async function invokeToolCall(
await ensureSourceCharmRunning(runtime, charmMeta);
}

const { resolve, promise } = Promise.withResolvers<any>();

// runSynced charm
runtime.editWithRetry((tx) => {
if (pattern) {
Expand All @@ -372,12 +374,22 @@ async function invokeToolCall(
}
});

await runtime.idle();

// If this was a pattern, stop it now that we have the result
if (pattern) runtime.runner.stop(result);
if (pattern) {
// wait until we know we have the result of the tool call
// not just that the transaction has been comitted
const cancel = result.sink((r) => {
r !== undefined && resolve(r);
});
const resultValue = await promise;
cancel();

return { type: "json", value: result.get() };
// stop it now that we have the result
runtime.runner.stop(result);
return { type: "json", value: resultValue };
} else {
await runtime.idle();
return { type: "json", value: result.get() };
}
}

/**
Expand Down