diff --git a/internal/cloud/code-agent-agentrun-adapter.ts b/internal/cloud/code-agent-agentrun-adapter.ts
index c5b911ac..9c03d14f 100644
--- a/internal/cloud/code-agent-agentrun-adapter.ts
+++ b/internal/cloud/code-agent-agentrun-adapter.ts
@@ -33,6 +33,9 @@ const AGENTRUN_BACKENDS = Object.freeze(["codex", "deepseek", "minimax-m3"]);
 const THREAD_CONTINUITY_POLICY = "hwlab-agentrun-v01-reuse-runner-thread";
 const SESSION_POLICY_RUN_LOCAL = "hwlab-agentrun-v01-session-runner-reuse";
 const TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "blocked", "cancelled", "canceled"]);
+const HWLAB_RESOURCE_TOOL_ALIASES = Object.freeze([
+  Object.freeze({ name: "hwpod", path: "tools/device-pod-cli.mjs", kind: "node-script" })
+]);
 
 export function codeAgentAgentRunAdapterEnabled(env = process.env) {
   const value = String(env.HWLAB_CODE_AGENT_ADAPTER ?? env.HWLAB_CODE_AGENT_PROVIDER ?? "").trim().toLowerCase();
@@ -379,7 +382,8 @@ function buildAgentRunCreateRunInput({ params, env, traceId, backendProfile, ses
         repoUrl: resolveAgentRunRepoUrl(env),
         commitId,
         submodules: false,
-        lfs: false
+        lfs: false,
+        toolAliases: HWLAB_RESOURCE_TOOL_ALIASES
       }
     : null;
   return {
diff --git a/internal/cloud/server-agent-chat.test.ts b/internal/cloud/server-agent-chat.test.ts
index 1eba39e0..a88cca21 100644
--- a/internal/cloud/server-agent-chat.test.ts
+++ b/internal/cloud/server-agent-chat.test.ts
@@ -171,6 +171,9 @@ test("cloud api /v1/agent/chat delegates v0.2 turns to AgentRun v0.1 over adapte
       assert.equal(body.backendProfile, "deepseek");
       assert.equal(body.resourceBundleRef.repoUrl, "http://git-mirror-http.devops-infra.svc.cluster.local/pikasTech/HWLAB.git");
       assert.equal(body.resourceBundleRef.commitId, "0123456789abcdef0123456789abcdef01234567");
+      assert.deepEqual(body.resourceBundleRef.toolAliases, [
+        { name: "hwpod", path: "tools/device-pod-cli.mjs", kind: "node-script" }
+      ]);
       assert.equal(Object.hasOwn(body.sessionRef, "threadId"), false);
       assert.equal(body.sessionRef.sessionId, "ses_server-test-agentrun");
       assert.equal(body.sessionRef.metadata.hwlabSessionId, "ses_server-test-agentrun");
@@ -210,6 +213,8 @@ test("cloud api /v1/agent/chat delegates v0.2 turns to AgentRun v0.1 over adapte
       assert.equal(transientEnv.HWLAB_RUNTIME_ENDPOINT_LOCKED, "1");
       assert.equal(transientEnv.HWLAB_CODE_AGENT_ASSEMBLED_RUNTIME, "1");
       assert.equal(transientEnv.HWLAB_DEVICE_POD_SESSION_TOKEN, "test-device-pod-session-token");
+      assert.equal(Object.hasOwn(transientEnv, "HWLAB_DEVICE_POD_API_URL"), false);
+      assert.equal(Object.hasOwn(transientEnv, "HWLAB_CODE_AGENT_DEVICE_POD_API_URL"), false);
       assert.ok(body.transientEnv.length <= 8);
       return send({
         action: "create-kubernetes-job",