let subagents inherit all the session rules of main agent

Author: xinyi-gong

com.microsoft.copilot.eclipse.swtbot.test/test-plans/terminal-auto-approve/terminal-auto-approve.md

@@ -419,3 +419,98 @@ actions in multi-command scenario
   **"Always Allow 'hostname'"**.
 - `echo` does **NOT** appear — it is globally allowed.
 - "Allow all commands in this Session" is still shown.
+
+---
+
+## 13. Subagent inherits parent session approvals
+
+### TC-013: Session approval in main agent applies to subagent calls
+
+**Type:** `Edge Case`
+**Priority:** `P1`
+
+#### Preconditions
+- No custom allow rules for `echo` or `cat` (only defaults).
+- "Auto approve commands not covered by rules" is **unchecked**.
+
+#### Steps
+1. In Agent Mode, send a prompt that triggers `echo hello`.
+2. Confirmation dialog appears.
+3. Click dropdown and select **"Allow 'echo' in this Session"**.
+4. The command executes.
+5. In the **same conversation**, send a complex prompt that causes the
+   agent to spawn a **subagent** (e.g., `use a subagent to run echo
+   from subagent`).
+6. The subagent invokes `run_in_terminal` with an `echo` command.
+7. Observe that **no confirmation dialog appears** — the session
+   approval from the main agent carries over to the subagent.
+8. Still in the subagent context, the subagent invokes a different
+   command (e.g., `cat somefile.txt`).
+9. Observe that a **confirmation dialog appears** — `cat` was not
+   session-approved.
+
+#### Expected Result
+- Subagent tool calls use the parent conversation's session rules.
+- Commands approved in the main agent conversation auto-approve in
+  subagent context.
+- Commands NOT approved still require confirmation in subagent context.
+
+#### 📸 Key Screenshots
+- [ ] Main agent: approving `echo` in session.
+- [ ] Subagent: `echo` auto-approved — no dialog.
+- [ ] Subagent: `cat` shows confirmation dialog.
+
+---
+
+### TC-014: Session approval in subagent carries back to main agent
+
+**Type:** `Edge Case`
+**Priority:** `P1`
+
+#### Preconditions
+- No custom allow rules for `hostname`.
+- "Auto approve commands not covered by rules" is **unchecked**.
+
+#### Steps
+1. In Agent Mode, send a complex prompt that triggers a **subagent**.
+2. The subagent invokes `run_in_terminal` with `hostname`.
+3. Confirmation dialog appears.
+4. Click dropdown and select **"Allow 'hostname' in this Session"**.
+5. The command executes in the subagent context.
+6. After the subagent completes, continue in the **same conversation**
+   with the main agent.
+7. Send a prompt that triggers `hostname` again (e.g., `what is my
+   hostname?`).
+8. Observe that **no confirmation dialog appears** — the session
+   approval made during the subagent call is shared with the main
+   conversation.
+
+#### Expected Result
+- Session approvals made during subagent execution are stored under
+  the parent conversation's session scope.
+- The main agent benefits from approvals granted in subagent context.
+
+#### 📸 Key Screenshots
+- [ ] Subagent: approving `hostname` in session.
+- [ ] Main agent: `hostname` auto-approved — no dialog.
+
+---
+
+### TC-015: "Allow all commands in this Session" in main agent covers subagent
+
+**Type:** `Edge Case`
+**Priority:** `P2`
+
+#### Steps
+1. In Agent Mode, trigger any terminal command.
+2. Confirmation dialog appears.
+3. Select **"Allow all commands in this Session"** from the dropdown.
+4. In the **same conversation**, send a prompt that spawns a subagent
+   which runs multiple different terminal commands.
+5. Observe that **none of them** show a confirmation dialog — the
+   blanket session approval covers subagent calls too.
+
+#### Expected Result
+- "Allow all commands in this Session" is a blanket approval that
+  applies to both main agent and subagent tool calls within the
+  same conversation.

com.microsoft.copilot.eclipse.ui.test/src/com/microsoft/copilot/eclipse/ui/chat/confirmation/TerminalConfirmationHandlerTests.java

@@ -108,7 +108,7 @@ void evaluate_autoApprovedWhenAllSubCommandsMatchAllowRules() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"echo hello"}, new String[]{"echo"},
             "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertTrue(result.isAutoApproved());
   }
@@ -121,7 +121,7 @@ void evaluate_needsConfirmationWhenDenyRuleMatches() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"rm -rf /"}, new String[]{"rm"},
             "rm -rf /");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertFalse(result.isAutoApproved());
     assertNotNull(result.getContent());
@@ -135,7 +135,7 @@ void evaluate_needsConfirmationWhenNoRulesMatchAndUnmatchedFalse() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"ls -la"}, new String[]{"ls"},
             "ls -la");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertFalse(result.isAutoApproved());
   }
@@ -148,7 +148,7 @@ void evaluate_autoApprovedWhenNoRulesMatchAndUnmatchedTrue() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"ls -la"}, new String[]{"ls"},
             "ls -la");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertTrue(result.isAutoApproved());
   }
@@ -159,7 +159,7 @@ void evaluate_needsConfirmationWhenSubCommandsNull() {
 
     InvokeClientToolConfirmationParams params =
         buildParams(null, null, "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertFalse(result.isAutoApproved());
   }
@@ -170,7 +170,7 @@ void evaluate_needsConfirmationWhenSubCommandsEmpty() {
 
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{}, null, "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertFalse(result.isAutoApproved());
   }
@@ -182,7 +182,7 @@ void evaluate_emptyRulesUsesUnmatchedSetting() {
 
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"ls"}, new String[]{"ls"}, "ls");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertTrue(result.isAutoApproved());
   }
@@ -200,9 +200,9 @@ void persistDecision_acceptAllSession_autoApprovesSubsequent() {
 
     ConfirmationAction allSession = buildSessionAction(
         TerminalConfirmationHandler.Action.ACCEPT_ALL_SESSION);
-    handler.persistDecision(allSession, params);
+    handler.persistDecision(allSession, params, CONV_ID);
 
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
     assertTrue(result.isAutoApproved());
   }
 
@@ -217,9 +217,9 @@ void persistDecision_acceptNamesSession_autoApprovesMatchingNames() {
 
     ConfirmationAction namesSession = buildSessionAction(
         TerminalConfirmationHandler.Action.ACCEPT_NAMES_SESSION);
-    handler.persistDecision(namesSession, params);
+    handler.persistDecision(namesSession, params, CONV_ID);
 
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
     assertTrue(result.isAutoApproved());
   }
 
@@ -234,9 +234,9 @@ void persistDecision_acceptExactSession_autoApprovesMatchingCommand() {
 
     ConfirmationAction exactSession = buildSessionAction(
         TerminalConfirmationHandler.Action.ACCEPT_EXACT_SESSION);
-    handler.persistDecision(exactSession, params);
+    handler.persistDecision(exactSession, params, CONV_ID);
 
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
     assertTrue(result.isAutoApproved());
   }
 
@@ -251,11 +251,11 @@ void clearSession_removesApprovalsForConversation() {
 
     ConfirmationAction allSession = buildSessionAction(
         TerminalConfirmationHandler.Action.ACCEPT_ALL_SESSION);
-    handler.persistDecision(allSession, params);
+    handler.persistDecision(allSession, params, CONV_ID);
 
     handler.clearSession(CONV_ID);
 
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
     assertFalse(result.isAutoApproved());
   }
 
@@ -270,11 +270,11 @@ void clearSession_doesNotAffectOtherConversation() {
 
     ConfirmationAction allSession = buildSessionAction(
         TerminalConfirmationHandler.Action.ACCEPT_ALL_SESSION);
-    handler.persistDecision(allSession, params);
+    handler.persistDecision(allSession, params, CONV_ID);
 
     handler.clearSession("other-conv");
 
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
     assertTrue(result.isAutoApproved());
   }
 
@@ -288,7 +288,7 @@ void buildContent_alwaysHasAllowOnceAsPrimary() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"echo"}, new String[]{"echo"},
             "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     ConfirmationContent content = result.getContent();
     assertNotNull(content);
@@ -306,7 +306,7 @@ void buildContent_alwaysHasSkipAsDismiss() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"echo"}, new String[]{"echo"},
             "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     List<ConfirmationAction> actions = result.getContent().getActions();
     ConfirmationAction last = actions.get(actions.size() - 1);
@@ -321,7 +321,7 @@ void buildContent_hasAllowAllSessionAction() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"echo"}, new String[]{"echo"},
             "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     List<ConfirmationAction> actions = result.getContent().getActions();
     boolean hasAllSession = actions.stream().anyMatch(a ->
@@ -341,7 +341,7 @@ void buildContent_hasCommandNameActionsWhenNamesPresent() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"echo"}, new String[]{"echo"},
             "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     List<ConfirmationAction> actions = result.getContent().getActions();
     boolean hasNamesSession = actions.stream().anyMatch(a ->
@@ -363,7 +363,7 @@ void buildContent_hasExactCommandActionsWhenDifferentFromName() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"echo"}, new String[]{"echo"},
             "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     List<ConfirmationAction> actions = result.getContent().getActions();
     boolean hasExactSession = actions.stream().anyMatch(a ->
@@ -384,7 +384,7 @@ void buildContent_noExactActionsWhenSingleSubCommandEqualsName() {
     // commandLine equals the single commandName
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"echo"}, new String[]{"echo"}, "echo");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     List<ConfirmationAction> actions = result.getContent().getActions();
     boolean hasExact = actions.stream().anyMatch(a ->
@@ -403,7 +403,7 @@ void buildContent_actionScopesAreCorrect() {
     InvokeClientToolConfirmationParams params =
         buildParams(new String[]{"echo"}, new String[]{"echo"},
             "echo hello");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     List<ConfirmationAction> actions = result.getContent().getActions();
 
@@ -490,15 +490,15 @@ void buildContent_filtersSessionApprovedNamesFromActions() {
     handler.persistDecision(
         buildSessionAction(
             TerminalConfirmationHandler.Action.ACCEPT_NAMES_SESSION),
-        approveParams);
+        approveParams, CONV_ID);
 
     // Now evaluate "echo hello && curl example.com"
     InvokeClientToolConfirmationParams params =
         buildParams(
             new String[]{"echo hello", "curl example.com"},
             new String[]{"echo", "curl"},
             "echo hello && curl example.com");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertFalse(result.isAutoApproved());
     List<ConfirmationAction> actions = result.getContent().getActions();
@@ -525,7 +525,7 @@ void buildContent_filtersGlobalApprovedNamesFromActions() {
             new String[]{"echo hello", "hostname"},
             new String[]{"echo", "hostname"},
             "echo hello && hostname");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertFalse(result.isAutoApproved());
     List<ConfirmationAction> actions = result.getContent().getActions();
@@ -552,7 +552,7 @@ void buildContent_allNamesApproved_autoApproves() {
     handler.persistDecision(
         buildSessionAction(
             TerminalConfirmationHandler.Action.ACCEPT_NAMES_SESSION),
-        approveParams);
+        approveParams, CONV_ID);
 
     // Evaluate "echo hello && curl example.com"
     // echo = global allow, curl = session allow → all approved
@@ -561,7 +561,7 @@ void buildContent_allNamesApproved_autoApproves() {
             new String[]{"echo hello", "curl example.com"},
             new String[]{"echo", "curl"},
             "echo hello && curl example.com");
-    ConfirmationResult result = handler.evaluate(params);
+    ConfirmationResult result = handler.evaluate(params, CONV_ID);
 
     assertTrue(result.isAutoApproved());
   }

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/confirmation/ConfirmationHandler.java

@@ -18,20 +18,26 @@ public interface ConfirmationHandler {
    * Implementations should check both global rules and session memory.
    *
    * @param params the confirmation request parameters from CLS
+   * @param sessionConversationId the conversation ID to use for session-scoped
+   *     lookups (may differ from params.getConversationId() when called from a
+   *     subagent context)
    * @return the confirmation result
    */
-  ConfirmationResult evaluate(InvokeClientToolConfirmationParams params);
+  ConfirmationResult evaluate(InvokeClientToolConfirmationParams params,
+      String sessionConversationId);
 
   /**
    * Persists a user's decision based on the action scope.
    * SESSION actions are stored in-memory per conversation;
    * GLOBAL actions are written to preferences.
    *
    * @param action the user's selected action with metadata
-   * @param params the original confirmation params (for conversationId etc.)
+   * @param params the original confirmation params (for command data etc.)
+   * @param sessionConversationId the conversation ID to use for session storage
    */
   default void persistDecision(ConfirmationAction action,
-      InvokeClientToolConfirmationParams params) {
+      InvokeClientToolConfirmationParams params,
+      String sessionConversationId) {
     // no-op by default
   }