Skip to content

Backport: Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream#15252

Closed
github-actions[bot] wants to merge 1 commit into
release-v5.0from
backport-pr-15169-to-release-v5.0
Closed

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

This is an automated backport of #15169 to the release-v5.0 branch. FYI @github-actions[bot]
This backport has conflicts that need to be resolved manually.

git cherry-pick output

CONFLICT (file location): examples/ai-functions/src/generate-text/google/interactions-agent-abort.ts added in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/interactions-agent-abort.ts.
CONFLICT (file location): examples/ai-functions/src/lib/cancel-on-sigint.ts added in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/lib/cancel-on-sigint.ts.
CONFLICT (file location): examples/ai-functions/src/stream-text/google/interactions-agent-abort.ts added in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/interactions-agent-abort.ts.
CONFLICT (modify/delete): examples/ai-functions/src/generate-text/google/interactions-agent-multi-turn.ts deleted in HEAD and modified in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)).  Version b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) of examples/ai-functions/src/generate-text/google/interactions-agent-multi-turn.ts left in tree.
CONFLICT (modify/delete): examples/ai-functions/src/generate-text/google/interactions-agent-single-turn.ts deleted in HEAD and modified in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)).  Version b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) of examples/ai-functions/src/generate-text/google/interactions-agent-single-turn.ts left in tree.
CONFLICT (modify/delete): examples/ai-functions/src/stream-text/google/interactions-agent-multi-turn.ts deleted in HEAD and modified in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)).  Version b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) of examples/ai-functions/src/stream-text/google/interactions-agent-multi-turn.ts left in tree.
CONFLICT (modify/delete): examples/ai-functions/src/stream-text/google/interactions-agent-single-turn.ts deleted in HEAD and modified in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)).  Version b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) of examples/ai-functions/src/stream-text/google/interactions-agent-single-turn.ts left in tree.
CONFLICT (modify/delete): packages/google/src/interactions/google-interactions-language-model.test.ts deleted in HEAD and modified in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)).  Version b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) of packages/google/src/interactions/google-interactions-language-model.test.ts left in tree.
CONFLICT (modify/delete): packages/google/src/interactions/google-interactions-language-model.ts deleted in HEAD and modified in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)).  Version b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) of packages/google/src/interactions/google-interactions-language-model.ts left in tree.
CONFLICT (modify/delete): packages/google/src/interactions/poll-google-interactions.test.ts deleted in HEAD and modified in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)).  Version b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) of packages/google/src/interactions/poll-google-interactions.test.ts left in tree.
CONFLICT (modify/delete): packages/google/src/interactions/poll-google-interactions.ts deleted in HEAD and modified in b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)).  Version b3642febb (Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)) of packages/google/src/interactions/poll-google-interactions.ts left in tree.
error: could not apply b3642febb... Backport: feat(provider/google): support cancelling long-running Interactions API agents via AbortSignal, and process their intermittent stream (#15169)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

@felixarntz
Copy link
Copy Markdown
Collaborator

opened by accident - this doesn't need to be backported to v5

@felixarntz felixarntz closed this May 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants