-
Notifications
You must be signed in to change notification settings - Fork 52
Add Rerun with copilot command #1316
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.
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
Open
motm32
wants to merge
16
commits into
main
Choose a base branch
from
meganmott/rerunCommands
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+989
−708
Open
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
97928e3
add new rerun command
motm32 0a7414b
pass in subscription
motm32 885ba92
small change
motm32 916813a
merge main
motm32 a3018d3
changes
motm32 8d89a5e
merge main and small change
motm32 4a614e2
changes
motm32 615a0f8
update utils
motm32 e4fb37b
merge main
motm32 e75058f
update package-lock
motm32 a2d0bf2
merge main and update utils
motm32 27ae3e9
update tas-client
motm32 b86fc26
merge
motm32 140842e
fix mismatch
motm32 4cb96ff
update again
motm32 3bfe85e
Merge branch 'main' into meganmott/rerunCommands
motm32 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.md in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { CopilotUserInput, createSubscriptionContext, executeCommandWithAddedContext, type IActionContext } from "@microsoft/vscode-azext-utils"; | ||
| import * as vscode from "vscode"; | ||
| import { ActivitySelectedCache } from "../chat/askAgentAboutActivityLog/ActivitySelectedCache"; | ||
| import { convertActivityTreeToSimpleObjectArray, ConvertedActivityItem } from "../chat/tools/GetAzureActivityLog/convertActivityTree"; | ||
| import { GetAzureActivityLogContext } from "../chat/tools/GetAzureActivityLog/GetAzureActivityLogContext"; | ||
| import { ActivityItem } from "../tree/activityLog/ActivityItem"; | ||
|
|
||
| export async function reRunWithCopilot(context: IActionContext, item: ActivityItem): Promise<void> { | ||
| const activitySelectedCache = ActivitySelectedCache.getInstance(); | ||
| activitySelectedCache.addActivity(item.id); | ||
|
|
||
| const activityContext: GetAzureActivityLogContext = { | ||
| ...context, | ||
| activitySelectedCache: activitySelectedCache | ||
| } | ||
|
|
||
| const activityItems: ConvertedActivityItem[] = await convertActivityTreeToSimpleObjectArray(activityContext); | ||
| context.ui = new CopilotUserInput(vscode, JSON.stringify(activityItems)); | ||
|
|
||
| // if subscription exists then add it to the context and | ||
| let wizardContext = context | ||
| const subscription = activityItems[0].activityAttributes?.subscription | ||
| if (subscription) { | ||
| const subscriptionContext = createSubscriptionContext(subscription); | ||
| wizardContext = { ...context, ...subscriptionContext }; | ||
| } | ||
|
|
||
| // An item will always be passed in so we will only need to look at the first item in the array | ||
| const callbackId = activityItems[0]?.callbackId; | ||
| if (callbackId) { | ||
| // todo: change this as the subscription may not always be the third thing passed in | ||
| await executeCommandWithAddedContext(callbackId, wizardContext, undefined, undefined, subscription) | ||
| } else { | ||
| throw new Error(vscode.l10n.t('Failed to rerun with Copilot. Activity item callback ID not found.')); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: We discussed it offline, but prefer it to be rerunWithCopilot just for stylistic reasons. Also may want to be more specific, like
rerunAzureActivityWithCopilotso people are aware that this is specifically for retrying commands that are in the activity log.