diff --git a/package-lock.json b/package-lock.json
index 40370fe..d6af582 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "a2amcp",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "a2amcp",
-      "version": "0.1.5",
+      "version": "0.1.6",
       "license": "Apache-2.0",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.0.4",
diff --git a/package.json b/package.json
index 957482c..51b15d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "a2amcp",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "MCP gateway for a2acloud agents. Run as a local MCP server; expose any number of deployed A2A agents to Claude Code, Cursor, and other MCP clients.",
   "type": "module",
   "bin": {
diff --git a/src/gateway.ts b/src/gateway.ts
index 39286cf..d38e234 100644
--- a/src/gateway.ts
+++ b/src/gateway.ts
@@ -95,7 +95,7 @@ export async function buildGateway(opts: GatewayOptions = {}): Promise<GatewayHa
     return { tools };
   });
 
-  server.setRequestHandler(CallToolRequestSchema, async (req) => {
+  server.setRequestHandler(CallToolRequestSchema, async (req, extra) => {
     const fullName = req.params.name;
     const idx = fullName.indexOf(SEP);
     if (idx < 0) {
@@ -107,10 +107,30 @@ export async function buildGateway(opts: GatewayOptions = {}): Promise<GatewayHa
     if (!upstream) {
       return _softError(`unknown agent: ${agentName}`) as any;
     }
+    // Honor the client's progressToken if it supplied one; else fall
+    // back to the request id. Either way, when upstream emits
+    // notifications/progress we forward them via the SDK's
+    // sendNotification so clients like Claude Code reset their idle
+    // tool-call timer and don't abort long builds.
+    const clientToken = (req.params._meta as any)?.progressToken as
+      | string
+      | number
+      | undefined;
+    const progressToken = clientToken ?? (extra.requestId as string | number);
     try {
       const result = await upstream.callTool(
         toolName,
         (req.params.arguments as Record<string, unknown>) ?? {},
+        {
+          progressToken,
+          onNotification: async (notif) => {
+            try {
+              await extra.sendNotification(notif as any);
+            } catch {
+              // best effort
+            }
+          },
+        },
       );
       // Pass through the upstream's CallToolResult as-is. Upstreams already
       // populate content / structuredContent / isError per the MCP spec.
diff --git a/src/upstream.ts b/src/upstream.ts
index 248dc49..bcdbffb 100644
--- a/src/upstream.ts
+++ b/src/upstream.ts
@@ -99,14 +99,22 @@ export class UpstreamAgent {
   async callTool(
     name: string,
     arguments_: Record<string, unknown>,
+    opts: {
+      onNotification?: (notif: {
+        method: string;
+        params?: Record<string, unknown>;
+      }) => void | Promise<void>;
+      progressToken?: string | number;
+    } = {},
   ): Promise<UpstreamCallResult> {
     const meta: Record<string, unknown> = {};
     if (this.cfg.cpJwt) meta.cp_jwt = this.cfg.cpJwt;
     if (this.cfg.cpUrl) meta.cp_url = this.cfg.cpUrl;
     if (this.cfg.bucket) meta.bucket = this.cfg.bucket;
+    if (opts.progressToken !== undefined) meta.progressToken = opts.progressToken;
     const params: Record<string, unknown> = { name, arguments: arguments_ };
     if (Object.keys(meta).length > 0) params._meta = meta;
-    return this.streamingCallTool(params);
+    return this.streamingCallTool(params, opts.onNotification);
   }
 
   /**
@@ -122,6 +130,10 @@ export class UpstreamAgent {
    */
   private async streamingCallTool(
     params: Record<string, unknown>,
+    onNotification?: (notif: {
+      method: string;
+      params?: Record<string, unknown>;
+    }) => void | Promise<void>,
   ): Promise<UpstreamCallResult> {
     const id = _nextId++;
     const headers: Record<string, string> = {
@@ -188,8 +200,21 @@ export class UpstreamAgent {
               }
               return msg.result as UpstreamCallResult;
             }
-            // else: server→client request (elicitation/create) or another
-            // frame; ignore — elicit relaying not wired yet.
+            // Otherwise it's a server→client message. Notifications
+            // (no id) → forward to the MCP client so long-running
+            // skills keep the client's tool-call timer alive. Requests
+            // (has id, has method) — e.g. elicitation/create — are
+            // not relayed yet, so they will time out upstream.
+            if (msg && typeof msg.method === "string" && !("id" in msg) && onNotification) {
+              try {
+                await onNotification({
+                  method: msg.method,
+                  params: msg.params as Record<string, unknown> | undefined,
+                });
+              } catch {
+                // Best-effort; never break the stream on a notify error.
+              }
+            }
           }
           sep = buf.indexOf("\n\n");
         }