From 31ee4f112bb8e5e4e85575f96c3ca6ded7f5d4aa Mon Sep 17 00:00:00 2001
From: Henrique Tolentino <htolentino@nvidia.com>
Date: Tue, 16 Jun 2026 16:11:43 -0400
Subject: [PATCH] Improve code agent interactions and show jobs on the
 artifacts panel

Signed-off-by: Henrique Tolentino <htolentino@nvidia.com>
---
 .../src/nmp/studio/coding_agent_artifacts.py  | 59 +++++++++++++++++
 .../src/nmp/studio/coding_agent_mcp_tools.py  | 16 ++++-
 .../studio/src/nmp/studio/coding_agents.py    |  3 +
 .../studio/tests/unit/test_coding_agents.py   | 65 +++++++++++++++++--
 .../ClaudeCodeHistoryPanel.test.tsx           | 30 +++++++++
 .../agents/ClaudeCodeChatRoute/api.test.ts    | 17 +++++
 .../routes/agents/ClaudeCodeChatRoute/api.ts  | 14 ++++
 .../ClaudeCodeChatRoute/artifacts.test.ts     | 23 ++++++-
 .../agents/ClaudeCodeChatRoute/artifacts.ts   | 56 ++++++++++++++++
 .../historyPanel/ArtifactSections.tsx         | 58 ++++++++++++++++-
 .../historyPanel/ClaudeCodeArtifactsPane.tsx  |  2 +
 .../historyPanel/helpers.ts                   |  1 +
 .../agents/ClaudeCodeChatRoute/types.ts       |  8 +++
 .../useClaudeCodeChatRuntime.test.ts          |  1 +
 .../agents/ClaudeCodeChatRoute/util.test.ts   |  6 +-
 15 files changed, 349 insertions(+), 10 deletions(-)

diff --git a/services/studio/src/nmp/studio/coding_agent_artifacts.py b/services/studio/src/nmp/studio/coding_agent_artifacts.py
index f1815c2bd8..83d407360d 100644
--- a/services/studio/src/nmp/studio/coding_agent_artifacts.py
+++ b/services/studio/src/nmp/studio/coding_agent_artifacts.py
@@ -33,6 +33,15 @@ class ChatLinkArtifactResponse(BaseModel):
     href: str | None = None
 
 
+class ChatJobArtifactResponse(BaseModel):
+    """A Studio job referenced during the chat."""
+
+    name: str
+    job_type: str | None = None
+    source: str | None = None
+    href: str | None = None
+
+
 class ChatArtifactsResponse(BaseModel):
     """Structured chat metadata shown in Studio's artifacts pane."""
 
@@ -44,6 +53,7 @@ class ChatArtifactsResponse(BaseModel):
     selections: list[ChatSelectionArtifactResponse] = Field(default_factory=list)
     files: list[ChatFileArtifactResponse] = Field(default_factory=list)
     links: list[ChatLinkArtifactResponse] = Field(default_factory=list)
+    jobs: list[ChatJobArtifactResponse] = Field(default_factory=list)
     tools: list[str] = Field(default_factory=list)
 
 
@@ -247,6 +257,44 @@ def _append_link_artifact(artifacts: ChatArtifactsResponse, input_value: Any) ->
     artifacts.links.append(artifact)
 
 
+def _upsert_job_artifact(
+    artifacts: ChatArtifactsResponse,
+    name: str,
+    job_type: str | None = None,
+    source: str | None = None,
+    href: str | None = None,
+) -> None:
+    for index, job in enumerate(artifacts.jobs):
+        if job.name != name:
+            continue
+        artifacts.jobs[index] = ChatJobArtifactResponse(
+            name=name,
+            job_type=job_type or job.job_type,
+            source=source or job.source,
+            href=href or job.href,
+        )
+        return
+
+    artifacts.jobs.append(ChatJobArtifactResponse(name=name, job_type=job_type, source=source, href=href))
+
+
+def _append_job_artifact(artifacts: ChatArtifactsResponse, input_value: Any) -> None:
+    if not isinstance(input_value, dict):
+        return
+
+    name = string_value(input_value.get("job_name")) or string_value(input_value.get("name"))
+    if not name:
+        return
+
+    _upsert_job_artifact(
+        artifacts,
+        name=name,
+        job_type=string_value(input_value.get("job_type")) or string_value(input_value.get("type")),
+        source=string_value(input_value.get("source")),
+        href=string_value(input_value.get("href")) or string_value(input_value.get("url")),
+    )
+
+
 def _normalize_spec_line(line: str) -> str:
     normalized = line.strip()
     normalized = re.sub(r"^#{1,6}\s+", "", normalized)
@@ -320,6 +368,17 @@ def record_tool_artifacts(
 
     if tool_name == "studio_link" or tool_name.endswith("__studio_link"):
         _append_link_artifact(artifacts, input_value)
+        if isinstance(input_value, dict):
+            destination = (
+                string_value(input_value.get("destination"))
+                or string_value(input_value.get("page"))
+                or string_value(input_value.get("resource_type"))
+            )
+            if destination == "job":
+                _append_job_artifact(artifacts, input_value)
+
+    if tool_name == "job_progress" or tool_name.endswith("__job_progress"):
+        _append_job_artifact(artifacts, input_value)
 
 
 def record_workspace_artifact(artifacts: ChatArtifactsResponse, content: str) -> None:
diff --git a/services/studio/src/nmp/studio/coding_agent_mcp_tools.py b/services/studio/src/nmp/studio/coding_agent_mcp_tools.py
index 15836fa306..d6d41be457 100644
--- a/services/studio/src/nmp/studio/coding_agent_mcp_tools.py
+++ b/services/studio/src/nmp/studio/coding_agent_mcp_tools.py
@@ -190,7 +190,21 @@
             "'health/ready' checks unless the user explicitly asks you to. Assume services are up and "
             "go straight to the actual task."
         ),
-        ("Prefer NeMo Studio MCP tools and the nemo CLI over ad-hoc shell or filesystem commands. "),
+        (
+            "Prefer NeMo Studio MCP tools and Studio views over CLI commands for user-facing "
+            "follow-up actions, navigation, inspection, and status/result review."
+        ),
+        (
+            "Do not tell the user to run nemo CLI commands, shell commands, curl commands, or status "
+            "commands to inspect agents, jobs, evaluations, filesets, models, traces, logs, or results "
+            "when a Studio view, Studio link, or Studio progress card is available for the same purpose."
+        ),
+        (
+            "Use CLI commands only to perform work that has no Studio UI equivalent, when the user "
+            "explicitly asks for CLI/debugging, or when you must gather data that Studio tools cannot "
+            "provide. For user-facing follow-up, prefer mcp__nemo_studio__studio_link and "
+            "mcp__nemo_studio__job_progress."
+        ),
         (
             "When you need to prompt the user for input, use a Studio UI tool instead of writing a "
             "plain-text question whenever a suitable tool exists."
diff --git a/services/studio/src/nmp/studio/coding_agents.py b/services/studio/src/nmp/studio/coding_agents.py
index 04984d75e1..e87cc6264d 100644
--- a/services/studio/src/nmp/studio/coding_agents.py
+++ b/services/studio/src/nmp/studio/coding_agents.py
@@ -294,6 +294,9 @@ def _build_studio_system_prompt(
         "For finite choices that have no dedicated Studio picker (for example deployments, jobs, or next actions) and for yes/no or multiple-choice clarifications, use Claude Code's AskUserQuestion tool so Studio can render clickable options instead of asking the user to type.",
         "For AskUserQuestion, provide input shaped as {'questions': [{'header': '<short title>', 'question': '<what should the user choose?>', 'options': [{'label': '<option>', 'description': '<short impact/details>'}]}]}.",
         "If you need both a finite choice and free-form text, ask multiple AskUserQuestion questions: first the finite options, then a text question without options.",
+        "Prefer NeMo Studio MCP tools and Studio views over CLI commands for user-facing follow-up actions, navigation, inspection, and status/result review.",
+        "Do not tell the user to run nemo CLI commands, shell commands, curl commands, or status commands to inspect agents, jobs, evaluations, filesets, models, traces, logs, or results when a Studio view, Studio link, or Studio progress card is available for the same purpose.",
+        "Use CLI commands only to perform work that has no Studio UI equivalent, when the user explicitly asks for CLI/debugging, or when you must gather data that Studio tools cannot provide.",
         "Required Studio-link behavior:",
         "Default to trying to include a Studio link in Studio-related responses.",
         "When your answer mentions or depends on a Studio resource, page, workflow, or result, first choose the nearest studio_link destination and include that link unless no relevant Studio page exists.",
diff --git a/services/studio/tests/unit/test_coding_agents.py b/services/studio/tests/unit/test_coding_agents.py
index 052c898937..c661834290 100644
--- a/services/studio/tests/unit/test_coding_agents.py
+++ b/services/studio/tests/unit/test_coding_agents.py
@@ -209,6 +209,16 @@ def test_list_and_get_history_sessions(
                                     "name": "mcp__nemo_studio__studio_link",
                                     "input": {"destination": "agents", "label": "Agents"},
                                 },
+                                {
+                                    "type": "tool_use",
+                                    "id": "toolu_job",
+                                    "name": "mcp__nemo_studio__job_progress",
+                                    "input": {
+                                        "job_name": "agent-eval-1",
+                                        "job_type": "agent_evaluation",
+                                        "source": "evaluator",
+                                    },
+                                },
                                 {
                                     "type": "tool_use",
                                     "id": "toolu_question",
@@ -306,8 +316,14 @@ def test_list_and_get_history_sessions(
             "first_prompt": "first prompt",
             "message_count": 1,
             "token_count": 30,
-            "tool_call_count": 4,
-            "tool_calls": ["Bash", "Write", "mcp__nemo_studio__studio_link", "AskUserQuestion"],
+            "tool_call_count": 5,
+            "tool_calls": [
+                "Bash",
+                "Write",
+                "mcp__nemo_studio__studio_link",
+                "mcp__nemo_studio__job_progress",
+                "AskUserQuestion",
+            ],
             "chat_artifacts": {
                 "agent": "cat-identifier",
                 "model": "cloud, nvidia/llama-3.3-nemotron-super-49b-v1",
@@ -317,7 +333,21 @@ def test_list_and_get_history_sessions(
                 "selections": [{"label": "Agent", "value": "beach-finder"}],
                 "files": [{"action": "Wrote", "path": "agents/beach-finder.yml"}],
                 "links": [{"label": "Agents", "destination": "agents", "href": "/workspaces/default/agents"}],
-                "tools": ["Bash", "Write", "mcp__nemo_studio__studio_link", "AskUserQuestion"],
+                "jobs": [
+                    {
+                        "name": "agent-eval-1",
+                        "job_type": "agent_evaluation",
+                        "source": "evaluator",
+                        "href": None,
+                    }
+                ],
+                "tools": [
+                    "Bash",
+                    "Write",
+                    "mcp__nemo_studio__studio_link",
+                    "mcp__nemo_studio__job_progress",
+                    "AskUserQuestion",
+                ],
             },
         }
     ]
@@ -352,6 +382,16 @@ def test_list_and_get_history_sessions(
                         "name": "mcp__nemo_studio__studio_link",
                         "input": {"destination": "agents", "label": "Agents"},
                     },
+                    {
+                        "type": "tool_use",
+                        "id": "toolu_job",
+                        "name": "mcp__nemo_studio__job_progress",
+                        "input": {
+                            "job_name": "agent-eval-1",
+                            "job_type": "agent_evaluation",
+                            "source": "evaluator",
+                        },
+                    },
                     {
                         "type": "tool_use",
                         "id": "toolu_question",
@@ -398,7 +438,21 @@ def test_list_and_get_history_sessions(
             "selections": [{"label": "Agent", "value": "beach-finder"}],
             "files": [{"action": "Wrote", "path": "agents/beach-finder.yml"}],
             "links": [{"label": "Agents", "destination": "agents", "href": "/workspaces/default/agents"}],
-            "tools": ["Bash", "Write", "mcp__nemo_studio__studio_link", "AskUserQuestion"],
+            "jobs": [
+                {
+                    "name": "agent-eval-1",
+                    "job_type": "agent_evaluation",
+                    "source": "evaluator",
+                    "href": None,
+                }
+            ],
+            "tools": [
+                "Bash",
+                "Write",
+                "mcp__nemo_studio__studio_link",
+                "mcp__nemo_studio__job_progress",
+                "AskUserQuestion",
+            ],
         },
     }
     assert session_id in coding_agents._initialized_sessions
@@ -1251,6 +1305,9 @@ async def fake_stream(session_id: str, message: str, mcp_url: str, studio_system
     assert "you MUST call mcp__nemo_studio__select_model" in captured["studio_system_prompt"]
     assert "ask multiple AskUserQuestion questions" in captured["studio_system_prompt"]
     assert "no dedicated Studio picker" in captured["studio_system_prompt"]
+    assert "Prefer NeMo Studio MCP tools and Studio views over CLI commands" in captured["studio_system_prompt"]
+    assert "Do not tell the user to run nemo CLI commands" in captured["studio_system_prompt"]
+    assert "when a Studio view, Studio link, or Studio progress card is available" in captured["studio_system_prompt"]
     assert "Default to trying to include a Studio link in Studio-related responses" in captured["studio_system_prompt"]
     assert "link to the closest list page for the current workspace" in captured["studio_system_prompt"]
     assert "Base Models or available base models use destination='base_models'" in captured["studio_system_prompt"]
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/ClaudeCodeHistoryPanel.test.tsx b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/ClaudeCodeHistoryPanel.test.tsx
index e0080cf4f3..ddacfe15bd 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/ClaudeCodeHistoryPanel.test.tsx
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/ClaudeCodeHistoryPanel.test.tsx
@@ -83,6 +83,36 @@ describe('ClaudeCodeHistoryPanel', () => {
     expect(onSelectSession).toHaveBeenCalledWith('session-1');
   });
 
+  it('renders job artifacts as Studio links', () => {
+    render(
+      <ClaudeCodeHistoryPanel
+        activeSessionId="session-1"
+        artifacts={{
+          workspace: 'default',
+          selections: [],
+          files: [],
+          links: [],
+          jobs: [
+            {
+              name: 'agent-eval-1',
+              job_type: 'agent_evaluation',
+              source: 'evaluator',
+            },
+          ],
+          tools: [],
+        }}
+        onNewChat={vi.fn()}
+        onSelectSession={vi.fn()}
+      />
+    );
+
+    expect(screen.getByText('Jobs')).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: /agent-eval-1/ })).toHaveAttribute(
+      'href',
+      '/workspaces/default/agents/evaluations/agent-eval-1'
+    );
+  });
+
   it('lists Claude Code skills in the skills tab', async () => {
     const user = userEvent.setup();
     render(
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/api.test.ts b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/api.test.ts
index 133ea63628..d2707d2103 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/api.test.ts
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/api.test.ts
@@ -68,6 +68,14 @@ describe('Claude Code API helpers', () => {
             ],
             files: [],
             links: [{ label: 'Agents', destination: 'agents', href: '/workspaces/default/agents' }],
+            jobs: [
+              {
+                name: 'agent-eval-1',
+                job_type: 'agent_evaluation',
+                source: 'evaluator',
+                href: '/workspaces/default/agents/evaluations/agent-eval-1',
+              },
+            ],
             tools: [],
           },
         }),
@@ -85,6 +93,14 @@ describe('Claude Code API helpers', () => {
     expect(history.chat_artifacts.links).toEqual([
       { label: 'Agents', destination: 'agents', href: '/workspaces/default/agents' },
     ]);
+    expect(history.chat_artifacts.jobs).toEqual([
+      {
+        name: 'agent-eval-1',
+        job_type: 'agent_evaluation',
+        source: 'evaluator',
+        href: '/workspaces/default/agents/evaluations/agent-eval-1',
+      },
+    ]);
   });
 
   it('emits structured permission requests from SSE events', async () => {
@@ -425,6 +441,7 @@ describe('Claude Code API helpers', () => {
         coding_agent_model: undefined,
         files: [],
         links: [],
+        jobs: [{ name: 'studio-job-1' }],
         model: undefined,
         model_source: undefined,
         selections: [],
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/api.ts b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/api.ts
index 705243e337..460f02b8b9 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/api.ts
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/api.ts
@@ -12,6 +12,7 @@ import type {
   ClaudeCodeAssistantHistoryPart,
   ClaudeCodeChatArtifacts,
   ClaudeCodeChatFileArtifact,
+  ClaudeCodeChatJobArtifact,
   ClaudeCodeChatLinkArtifact,
   ClaudeCodeChatModelSource,
   ClaudeCodeChatSelectionArtifact,
@@ -141,6 +142,18 @@ const parseLinkArtifact = (value: unknown): ClaudeCodeChatLinkArtifact | undefin
   };
 };
 
+const parseJobArtifact = (value: unknown): ClaudeCodeChatJobArtifact | undefined => {
+  if (!isRecord(value)) return undefined;
+  const name = getOptionalArtifactString(value.name);
+  if (!name) return undefined;
+  return {
+    name,
+    job_type: getOptionalArtifactString(value.job_type),
+    source: getOptionalArtifactString(value.source),
+    href: getOptionalString(value.href),
+  };
+};
+
 const parseArray = <T>(value: unknown, parseItem: (item: unknown) => T | undefined): T[] =>
   Array.isArray(value) ? value.map(parseItem).filter((item): item is T => item !== undefined) : [];
 
@@ -162,6 +175,7 @@ const parseChatArtifacts = (value: unknown): ClaudeCodeChatArtifacts => {
     selections: parseArray(value.selections, parseSelectionArtifact),
     files: parseArray(value.files, parseFileArtifact),
     links: parseArray(value.links, parseLinkArtifact),
+    jobs: parseArray(value.jobs, parseJobArtifact),
     tools: getStringArray(value.tools).map(cleanClaudeCodeArtifactText),
   };
 };
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/artifacts.test.ts b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/artifacts.test.ts
index a8f629ff94..a1cd3f49bf 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/artifacts.test.ts
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/artifacts.test.ts
@@ -77,6 +77,15 @@ describe('Claude Code chat artifacts', () => {
               name: 'mcp__nemo_studio__studio_link',
               input: { destination: 'agents', label: 'Agents' },
             },
+            {
+              type: 'tool_use',
+              name: 'mcp__nemo_studio__job_progress',
+              input: {
+                job_name: 'agent-eval-1',
+                job_type: 'agent_evaluation',
+                source: 'evaluator',
+              },
+            },
           ],
         },
       }
@@ -86,7 +95,19 @@ describe('Claude Code chat artifacts', () => {
     expect(artifacts.links).toEqual([
       { label: 'Agents', destination: 'agents', href: '/workspaces/default/agents' },
     ]);
-    expect(artifacts.tools).toEqual(['Write', 'mcp__nemo_studio__studio_link']);
+    expect(artifacts.jobs).toEqual([
+      {
+        name: 'agent-eval-1',
+        job_type: 'agent_evaluation',
+        source: 'evaluator',
+        href: '/workspaces/default/agents/evaluations/agent-eval-1',
+      },
+    ]);
+    expect(artifacts.tools).toEqual([
+      'Write',
+      'mcp__nemo_studio__studio_link',
+      'mcp__nemo_studio__job_progress',
+    ]);
   });
 
   it('does not double encode encoded file paths in studio link artifacts', () => {
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/artifacts.ts b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/artifacts.ts
index d9c3de1bed..ba64b9ca73 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/artifacts.ts
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/artifacts.ts
@@ -4,10 +4,12 @@
 import type {
   ClaudeCodeChatArtifacts,
   ClaudeCodeChatFileArtifact,
+  ClaudeCodeChatJobArtifact,
   ClaudeCodeChatLinkArtifact,
   ClaudeCodeChatSelectionArtifact,
   ClaudeCodeSessionHistoryItem,
 } from '@studio/routes/agents/ClaudeCodeChatRoute/types';
+import { getJobProgressDetailRoute } from '@studio/routes/agents/ClaudeCodeChatRoute/utils/jobProgress';
 
 interface ClaudeCodeArtifactQuestion {
   header?: string;
@@ -130,6 +132,7 @@ export const createEmptyClaudeCodeChatArtifacts = (): ClaudeCodeChatArtifacts =>
   selections: [],
   files: [],
   links: [],
+  jobs: [],
   tools: [],
 });
 
@@ -228,6 +231,7 @@ const cloneArtifacts = (artifacts: ClaudeCodeChatArtifacts): ClaudeCodeChatArtif
   selections: [...artifacts.selections],
   files: [...artifacts.files],
   links: [...artifacts.links],
+  jobs: [...artifacts.jobs],
   tools: [...artifacts.tools],
 });
 
@@ -306,6 +310,53 @@ const appendLink = (artifacts: ClaudeCodeChatArtifacts, link: ClaudeCodeChatLink
   artifacts.links.push(link);
 };
 
+const upsertJob = (artifacts: ClaudeCodeChatArtifacts, job: ClaudeCodeChatJobArtifact) => {
+  const existingIndex = artifacts.jobs.findIndex((item) => item.name === job.name);
+  if (existingIndex >= 0) {
+    const existingJob = artifacts.jobs[existingIndex];
+    if (!existingJob) return;
+
+    artifacts.jobs[existingIndex] = {
+      ...existingJob,
+      ...job,
+      job_type: job.job_type ?? existingJob.job_type,
+      source: job.source ?? existingJob.source,
+      href: job.href ?? existingJob.href,
+    };
+    return;
+  }
+  artifacts.jobs.push(job);
+};
+
+const buildJobHref = (
+  jobName: string,
+  input: Record<string, unknown>,
+  workspace: string | undefined
+): string | undefined => {
+  const explicitHref = getString(input.href) ?? getString(input.url);
+  if (explicitHref) return explicitHref;
+  if (!workspace) return undefined;
+
+  return getJobProgressDetailRoute({
+    jobName,
+    jobType: getString(input.job_type) ?? getString(input.type),
+    source: getString(input.source),
+    workspace,
+  });
+};
+
+const recordJobArtifact = (artifacts: ClaudeCodeChatArtifacts, input: Record<string, unknown>) => {
+  const name = getString(input.job_name) ?? getString(input.name);
+  if (!name) return;
+
+  upsertJob(artifacts, {
+    name,
+    job_type: getString(input.job_type) ?? getString(input.type),
+    source: getString(input.source),
+    href: buildJobHref(name, input, artifacts.workspace),
+  });
+};
+
 const normalizeSpecLine = (line: string): string =>
   line
     .trim()
@@ -380,6 +431,11 @@ const recordToolArtifacts = (
     const label = getString(input.label) ?? destination;
     const href = buildStudioLinkHrefFromInput(input, artifacts.workspace);
     if (label) appendLink(artifacts, { label, destination, href });
+    if (destination === 'job') recordJobArtifact(artifacts, input);
+  }
+
+  if ((toolName === 'job_progress' || toolName.endsWith('__job_progress')) && isRecord(input)) {
+    recordJobArtifact(artifacts, input);
   }
 };
 
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/ArtifactSections.tsx b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/ArtifactSections.tsx
index b661aec8e3..5977368399 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/ArtifactSections.tsx
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/ArtifactSections.tsx
@@ -9,11 +9,13 @@ import { getStudioInternalLinkTarget } from '@studio/routes/agents/ClaudeCodeCha
 import { getFileLabel } from '@studio/routes/agents/ClaudeCodeChatRoute/historyPanel/helpers';
 import type {
   ClaudeCodeChatFileArtifact,
+  ClaudeCodeChatJobArtifact,
   ClaudeCodeChatLinkArtifact,
   ClaudeCodeChatSelectionArtifact,
 } from '@studio/routes/agents/ClaudeCodeChatRoute/types';
+import { getJobProgressDetailRoute } from '@studio/routes/agents/ClaudeCodeChatRoute/utils/jobProgress';
 import cn from 'classnames';
-import { ArrowRight, Boxes, FileCode2, Link2, Sparkles, Wrench } from 'lucide-react';
+import { ArrowRight, Boxes, Briefcase, FileCode2, Link2, Sparkles, Wrench } from 'lucide-react';
 import { type ReactNode } from 'react';
 import { Link } from 'react-router-dom';
 
@@ -156,6 +158,60 @@ export const LinkArtifacts = ({ links }: { links: ClaudeCodeChatLinkArtifact[] }
   );
 };
 
+const getJobArtifactHref = (
+  job: ClaudeCodeChatJobArtifact,
+  workspace: string | undefined
+): string | undefined => {
+  if (job.href) return job.href;
+  if (!workspace) return undefined;
+
+  return getJobProgressDetailRoute({
+    jobName: job.name,
+    jobType: job.job_type,
+    source: job.source,
+    workspace,
+  });
+};
+
+export const JobArtifacts = ({
+  jobs,
+  workspace: artifactWorkspace,
+}: {
+  jobs: ClaudeCodeChatJobArtifact[];
+  workspace?: string;
+}) => {
+  const currentWorkspace = useWorkspaceFromPathIfExists();
+  const workspace = currentWorkspace ?? artifactWorkspace;
+
+  if (!jobs.length) return null;
+
+  return (
+    <ArtifactSection icon={<Briefcase size={14} />} title="Jobs">
+      <Flex gap="density-xs" className="min-w-0 flex-wrap">
+        {jobs.slice(0, 6).map((job) => {
+          const target = getStudioInternalLinkTarget(
+            getJobArtifactHref(job, workspace),
+            window.location.origin,
+            workspace
+          );
+          const label = cleanClaudeCodeArtifactText(job.name);
+
+          return target ? (
+            <Anchor asChild key={job.name}>
+              <Link className={CLAUDE_CODE_STUDIO_LINK_CLASS} to={target}>
+                <span className="truncate">{label}</span>
+                <ArrowRight aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
+              </Link>
+            </Anchor>
+          ) : (
+            <ArtifactChip key={job.name}>{label}</ArtifactChip>
+          );
+        })}
+      </Flex>
+    </ArtifactSection>
+  );
+};
+
 export const SelectionArtifacts = ({
   selections,
 }: {
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/ClaudeCodeArtifactsPane.tsx b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/ClaudeCodeArtifactsPane.tsx
index d4317e3a9c..10892cd9f2 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/ClaudeCodeArtifactsPane.tsx
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/ClaudeCodeArtifactsPane.tsx
@@ -6,6 +6,7 @@ import { Empty } from '@studio/components/Empty';
 import {
   ArtifactRow,
   FileArtifacts,
+  JobArtifacts,
   LinkArtifacts,
   SelectionArtifacts,
   ToolArtifacts,
@@ -62,6 +63,7 @@ export const ClaudeCodeArtifactsPane = ({
             <ArtifactRow icon={<Boxes size={14} />} label="Workspace" value={artifacts.workspace} />
           </Stack>
           <SelectionArtifacts selections={artifacts.selections} />
+          <JobArtifacts jobs={artifacts.jobs} workspace={artifacts.workspace} />
           <FileArtifacts files={artifacts.files} />
           <LinkArtifacts links={artifacts.links} />
           <ToolArtifacts tools={artifacts.tools} />
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/helpers.ts b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/helpers.ts
index a7c089b174..2eacc717aa 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/helpers.ts
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/historyPanel/helpers.ts
@@ -50,5 +50,6 @@ export const hasArtifacts = (
     artifacts.selections.length ||
     artifacts.files.length ||
     artifacts.links.length ||
+    artifacts.jobs.length ||
     artifacts.tools.length
   );
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/types.ts b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/types.ts
index 34d79d475d..958dc8232d 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/types.ts
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/types.ts
@@ -55,6 +55,13 @@ export interface ClaudeCodeChatLinkArtifact {
   href?: string;
 }
 
+export interface ClaudeCodeChatJobArtifact {
+  name: string;
+  job_type?: string;
+  source?: string;
+  href?: string;
+}
+
 export type ClaudeCodeChatModelSource = 'coding_agent' | 'selection' | 'spec';
 
 export interface ClaudeCodeChatArtifacts {
@@ -66,6 +73,7 @@ export interface ClaudeCodeChatArtifacts {
   selections: ClaudeCodeChatSelectionArtifact[];
   files: ClaudeCodeChatFileArtifact[];
   links: ClaudeCodeChatLinkArtifact[];
+  jobs: ClaudeCodeChatJobArtifact[];
   tools: string[];
 }
 
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/useClaudeCodeChatRuntime.test.ts b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/useClaudeCodeChatRuntime.test.ts
index 5da9f16684..7e8c429f73 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/useClaudeCodeChatRuntime.test.ts
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/useClaudeCodeChatRuntime.test.ts
@@ -106,6 +106,7 @@ describe('useClaudeCodeChatRuntime', () => {
                 selections: [],
                 files: [],
                 links: [],
+                jobs: [],
                 tools: [],
               }
             : undefined,
diff --git a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/util.test.ts b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/util.test.ts
index 79637fc109..682e66c0dd 100644
--- a/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/util.test.ts
+++ b/web/packages/studio/src/routes/agents/ClaudeCodeChatRoute/util.test.ts
@@ -29,7 +29,7 @@ describe('Claude Code utilities', () => {
   it('converts stored transcript items to assistant-ui messages', () => {
     const history: ClaudeCodeSessionHistory = {
       session_id: '2dc6e5a6-acd7-43bf-b128-c9fd5cf6eb9a',
-      chat_artifacts: { selections: [], files: [], links: [], tools: [] },
+      chat_artifacts: { selections: [], files: [], links: [], jobs: [], tools: [] },
       items: [
         { kind: 'user', text: 'check the repo' },
         {
@@ -154,7 +154,7 @@ describe('Claude Code utilities', () => {
   it('combines consecutive tool-only assistant transcript items', () => {
     const history: ClaudeCodeSessionHistory = {
       session_id: 'session-1',
-      chat_artifacts: { selections: [], files: [], links: [], tools: [] },
+      chat_artifacts: { selections: [], files: [], links: [], jobs: [], tools: [] },
       items: [
         { kind: 'user', text: 'map the repo' },
         {
@@ -222,7 +222,7 @@ describe('Claude Code utilities', () => {
   it('keeps stored job progress tool calls visible in history', () => {
     const history: ClaudeCodeSessionHistory = {
       session_id: 'session-1',
-      chat_artifacts: { selections: [], files: [], links: [], tools: [] },
+      chat_artifacts: { selections: [], files: [], links: [], jobs: [], tools: [] },
       items: [
         { kind: 'user', text: 'evaluate my agent' },
         {