chore: stop sessions by id

Author: dkattan

package.json

@@ -2,7 +2,7 @@
   "publisher": "dkattan",
   "name": "copilot-breakpoint-debugger",
   "displayName": "Copilot Breakpoint Debugger",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "_versionComment": "Version is auto-generated by the CI auto-release workflow. Manual edits are overwritten.",
   "description": "Use GitHub Copilot to automate starting, inspecting and resuming VS Code debug sessions with conditional breakpoints, exact numeric hit counts (hitCount), logpoints, and capture actions that interpolate variables inside log messages.",
   "license": "MIT",
@@ -465,18 +465,18 @@
         "displayName": "Stop Debug Session",
         "toolReferenceName": "stopDebugSession",
         "canBeReferencedInPrompt": true,
-        "userDescription": "Terminate one or more debug sessions matching a name (exit option).",
-        "modelDescription": "Stop (terminate) all active debug sessions whose name matches the provided sessionName.",
+        "userDescription": "Terminate one or more debug sessions by id (aligns with resumeDebugSession).",
+        "modelDescription": "Stop (terminate) all active debug sessions whose id matches the provided sessionId.",
         "inputSchema": {
           "type": "object",
           "properties": {
-            "sessionName": {
+            "sessionId": {
               "type": "string",
-              "description": "Name of the debug session to stop."
+              "description": "Id of the debug session to stop."
             }
           },
           "required": [
-            "sessionName"
+            "sessionId"
           ]
         }
       }

src/session.ts

@@ -2311,23 +2311,21 @@ export const startDebuggingAndWaitForStop = async (
 };
 
 /**
- * Stop debug sessions that match the provided session name.
+ * Stop debug sessions that match the provided session id.
  *
- * @param params - Object containing the sessionName to stop.
- * @param params.sessionName - Name of the debug session(s) to stop.
+ * @param params - Object containing the sessionId to stop.
+ * @param params.sessionId - ID of the debug session(s) to stop.
  */
-export const stopDebugSession = async (params: { sessionName: string }) => {
-  const { sessionName } = params;
-  // Filter active sessions to find matching sessions.
+export const stopDebugSession = async (params: { sessionId: string }) => {
+  const { sessionId } = params;
   const matchingSessions = activeSessions.filter(
-    (session: vscode.DebugSession) => session.name === sessionName
+    (session: vscode.DebugSession) => session.id === sessionId
   );
 
   if (matchingSessions.length === 0) {
-    throw new Error(`No debug session(s) found with name '${sessionName}'.`);
+    throw new Error(`No debug session(s) found with id '${sessionId}'.`);
   }
 
-  // Stop each matching debug session.
   for (const session of matchingSessions) {
     await vscode.debug.stopDebugging(session);
   }

src/startDebuggerTool.ts

@@ -244,13 +244,26 @@ export class StartDebuggerTool
         const state = stopInfo.debuggerState;
         const sessionId = state.sessionId ?? "unknown";
         const sessionLabel = state.sessionName ?? sessionId ?? "unknown";
+        const availableTools = "resumeDebugSession, getVariables, expandVariable, evaluateExpression, stopDebugSession";
         switch (state.status) {
           case "paused":
-            return `Debugger State: paused on '${sessionLabel}' (id=${sessionId}). Available tools: resumeDebugSession, getVariables, expandVariable, evaluateExpression, stopDebugSession. Example: resumeDebugSession with debugSessionId='${sessionId}'.`;
+            return [
+              `Debugger State: paused on '${sessionLabel}' (id=${sessionId}).`,
+              `Available tools: ${availableTools}.`,
+              `Recommended tool: resumeDebugSession with sessionId='${sessionId}'.`,
+            ].join("\r\n");
           case "terminated":
-            return "Debugger State: terminated. Available tool: startDebugSessionWithBreakpoints to begin a new session.";
+            return [
+              "Debugger State: terminated.",
+              "Available tool: startDebugSessionWithBreakpoints to begin a new session.",
+              "Recommended tool: startDebugSessionWithBreakpoints to create a new session.",
+            ].join("\r\n");
           case "running":
-            return `Debugger State: running. (onHit 'captureAndContinue' continued session '${sessionLabel}'). Available tool: resumeDebugSession with new breakpoints.`;
+            return [
+              `Debugger State: running. (onHit 'captureAndContinue' continued session '${sessionLabel}').`,
+              `Available tools: ${availableTools}.`,
+              `Recommended tool: resumeDebugSession with sessionId='${sessionId}' to add breakpoints and continue.`,
+            ].join("\r\n");
         }
       })();
 
@@ -265,25 +278,25 @@ export class StartDebuggerTool
         !hasConfiguredOnHit
       ) {
         guidance.push(
-          "Tip: No onHit behavior was set; consider onHit 'captureAndContinue' to keep the session alive and still collect data."
+          "No onHit behavior was set; consider onHit 'captureAndContinue' to keep the session alive and still collect data."
         );
       }
 
       if (!multipleBreakpoints) {
         guidance.push(
-          "Tip: You can supply multiple breakpoints, each with its own onHit (e.g., trace with captureAndContinue, then stopDebugging at a later line)."
+          "You can supply multiple breakpoints, each with its own onHit (e.g., trace with captureAndContinue, then stopDebugging at a later line)."
         );
       }
 
       if (onHit === "captureAndContinue" && activeFilters.length === 0) {
         guidance.push(
-          `Tip: captureAndContinue auto-captured ${totalVars} variable(s); set variableFilter to focus only the names you care about.`
+          `captureAndContinue auto-captured ${totalVars} variable(s); set variableFilter to focus only the names you care about.`
         );
       }
 
       if (truncatedVariables) {
         guidance.push(
-          "Tip: Values were truncated to 100 characters. Provide variableFilter to return full values without truncation."
+          "Values were truncated to 100 characters. Provide variableFilter to return full values without truncation."
         );
       }
 

src/stopDebugSessionTool.ts

@@ -9,7 +9,7 @@ import { LanguageModelTextPart, LanguageModelToolResult } from "vscode";
 import { stopDebugSession } from "./session";
 
 export interface StopDebugSessionToolParameters {
-  sessionName: string; // Name of session to stop (supports multiple with same name)
+  sessionId: string; // ID of session to stop (aligns with resumeDebugSession)
 }
 
 export class StopDebugSessionTool
@@ -18,12 +18,12 @@ export class StopDebugSessionTool
   async invoke(
     options: LanguageModelToolInvocationOptions<StopDebugSessionToolParameters>
   ): Promise<LanguageModelToolResult> {
-    const { sessionName } = options.input;
+    const { sessionId } = options.input;
     try {
-      await stopDebugSession({ sessionName });
+      await stopDebugSession({ sessionId });
       return new LanguageModelToolResult([
         new LanguageModelTextPart(
-          `Stopped debug session(s) named '${sessionName}'.`
+          `Stopped debug session(s) with id '${sessionId}'.`
         ),
       ]);
     } catch (error) {
@@ -41,7 +41,7 @@ export class StopDebugSessionTool
     options: LanguageModelToolInvocationPrepareOptions<StopDebugSessionToolParameters>
   ): ProviderResult<vscode.PreparedToolInvocation> {
     return {
-      invocationMessage: `Stopping debug session(s) named '${options.input.sessionName}'`,
+      invocationMessage: `Stopping debug session(s) with id '${options.input.sessionId}'`,
     };
   }
 }