From d0b80122464f87781159b8d4a683f55a81272b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Beaufort?= <beaufort.francois@gmail.com>
Date: Tue, 9 Jun 2026 11:53:43 +0200
Subject: [PATCH 1/3] Reject registerTool promise if signal is aborted

---
 index.bs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/index.bs b/index.bs
index 6f86e33..777f073 100644
--- a/index.bs
+++ b/index.bs
@@ -399,9 +399,8 @@ The <dfn method for=ModelContext>registerTool(<var>tool</var>, <var>options</var
 
 1. If |signal| [=map/exists=], then:
 
-   1. If |signal| is [=AbortSignal/aborted=], then optionally [=report a warning to the console=]
-      indicating that the tool was not registered because the {{AbortSignal}} was already
-      [=AbortSignal/aborted=], and return.
+   1. If |signal| is [=AbortSignal/aborted=], then return [=a promise rejected with=]
+      |signal|'s [=AbortSignal/abort reason=].
 
    1. [=AbortSignal/add|Add an abort algorithm=] to |signal| that [=model context/unregisters a
       tool=] given [=this=] and |tool name|.

From bb4d3e9164da82576de5dd9203fabf57d6a737da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Beaufort?= <beaufort.francois@gmail.com>
Date: Tue, 9 Jun 2026 13:31:19 +0200
Subject: [PATCH 2/3] Update abort algorithm

---
 index.bs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/index.bs b/index.bs
index 777f073..567dca7 100644
--- a/index.bs
+++ b/index.bs
@@ -395,6 +395,8 @@ The <dfn method for=ModelContext>registerTool(<var>tool</var>, <var>options</var
 1. Let |untrusted content hint| be true if |tool|'s {{ModelContextTool/annotations}} [=map/exists=] and
    its {{ToolAnnotations/untrustedContentHint}} is true. Otherwise, let it be false.
 
+1. Let |promise| be [=a new promise=] created in [=this=]'s [=relevant realm=].
+
 1. Let |signal| be |options|'s {{ModelContextRegisterToolOptions/signal}}.
 
 1. If |signal| [=map/exists=], then:
@@ -402,8 +404,11 @@ The <dfn method for=ModelContext>registerTool(<var>tool</var>, <var>options</var
    1. If |signal| is [=AbortSignal/aborted=], then return [=a promise rejected with=]
       |signal|'s [=AbortSignal/abort reason=].
 
-   1. [=AbortSignal/add|Add an abort algorithm=] to |signal| that [=model context/unregisters a
-      tool=] given [=this=] and |tool name|.
+   1. [=AbortSignal/add|Add the following abort steps=] to |signal|:
+
+        1. [=model context/Unregister a tool=] given [=this=] and |tool name|.
+
+        1. [=Reject=] |promise| with |signal|'s [=AbortSignal/abort reason=].
 
 1. Let |exposed origins| be an empty [=list=] of [=origins=].
 
@@ -447,8 +452,6 @@ The <dfn method for=ModelContext>registerTool(<var>tool</var>, <var>options</var
 
 1. Set [=this=]'s [=ModelContext/internal context=][|tool name|] to |tool definition|.
 
-1. Let |promise| be [=a new promise=] created in [=this=]'s [=relevant realm=].
-
 1. Run the following steps [=in parallel=]:
 
   1. [=Notify documents of a tool change=] given |tool owner| and |exposed origins|.

From 7526883e2d60248ed1db95a970f149f4d4dd2ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Beaufort?= <beaufort.francois@gmail.com>
Date: Wed, 17 Jun 2026 10:30:12 +0200
Subject: [PATCH 3/3] Fix unregister tool algorithm

---
 index.bs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.bs b/index.bs
index 567dca7..fd3c0bc 100644
--- a/index.bs
+++ b/index.bs
@@ -258,7 +258,7 @@ To <dfn for="model context">unregister a tool</dfn> given a {{ModelContext}} |mo
 1. Let |tool map| be |modelContext|'s [=ModelContext/internal context=]'s [=model context/tool
    map=].
 
-1. [=Assert=] |tool map|[|tool name|] [=map/exists=].
+1. If |tool map|[|tool name|] does not [=map/exist=], then return.
 
 1. Let |exposed origins| be |tool map|[|tool name|]'s [=tool definition/exposed origins=].