From 00210d3e1bd7866df29a2a0e5bf45e8402c8ff55 Mon Sep 17 00:00:00 2001
From: "trueforge-dev-bot[bot]"
 <trueforge-dev-bot[bot]@users.noreply.github.com>
Date: Fri, 11 Sep 2026 07:47:18 +0000
Subject: [PATCH 1/9] Regenerate OpenAPI document and TypeScript SDK

---
 .github/fern/openapi/openapi.json                    |  5 ++++-
 docs/openapi.json                                    |  5 ++++-
 packages/trueforge-sdk/reference.md                  |  1 +
 .../src/api/resources/agents/client/Client.ts        |  1 +
 .../agents/client/requests/CreateAgentRequest.ts     |  3 ++-
 .../agents/client/requests/CreateAgentRequest.ts     |  4 ++--
 packages/trueforge-sdk/tests/wire/agents.test.ts     | 12 ++++++++----
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.json
index b295b3484..3bcea27c9 100644
--- a/.github/fern/openapi/openapi.json
+++ b/.github/fern/openapi/openapi.json
@@ -32,6 +32,7 @@
           "description": {
             "description": "Short summary of what the agent does.",
             "maxLength": 1024,
+            "minLength": 1,
             "type": "string"
           },
           "id": {
@@ -989,9 +990,9 @@
         "additionalProperties": false,
         "properties": {
           "description": {
-            "default": "",
             "description": "Short summary of what the agent does.",
             "maxLength": 1024,
+            "minLength": 1,
             "type": "string"
           },
           "manifest": {
@@ -1003,6 +1004,7 @@
         },
         "required": [
           "name",
+          "description",
           "manifest"
         ],
         "type": "object"
@@ -5341,6 +5343,7 @@
           "description": {
             "description": "Short summary of what the agent does.",
             "maxLength": 1024,
+            "minLength": 1,
             "type": "string"
           },
           "manifest": {
diff --git a/docs/openapi.json b/docs/openapi.json
index b295b3484..3bcea27c9 100644
--- a/docs/openapi.json
+++ b/docs/openapi.json
@@ -32,6 +32,7 @@
           "description": {
             "description": "Short summary of what the agent does.",
             "maxLength": 1024,
+            "minLength": 1,
             "type": "string"
           },
           "id": {
@@ -989,9 +990,9 @@
         "additionalProperties": false,
         "properties": {
           "description": {
-            "default": "",
             "description": "Short summary of what the agent does.",
             "maxLength": 1024,
+            "minLength": 1,
             "type": "string"
           },
           "manifest": {
@@ -1003,6 +1004,7 @@
         },
         "required": [
           "name",
+          "description",
           "manifest"
         ],
         "type": "object"
@@ -5341,6 +5343,7 @@
           "description": {
             "description": "Short summary of what the agent does.",
             "maxLength": 1024,
+            "minLength": 1,
             "type": "string"
           },
           "manifest": {
diff --git a/packages/trueforge-sdk/reference.md b/packages/trueforge-sdk/reference.md
index dd0e0a9aa..dca445821 100644
--- a/packages/trueforge-sdk/reference.md
+++ b/packages/trueforge-sdk/reference.md
@@ -150,6 +150,7 @@ Creates an agent and allocates an immutable id. Fails if `name` is already taken
 
 ```typescript
 await client.agents.create({
+    description: "description",
     manifest: {
         model: {
             name: "name"
diff --git a/packages/trueforge-sdk/src/api/resources/agents/client/Client.ts b/packages/trueforge-sdk/src/api/resources/agents/client/Client.ts
index fa1440f6f..658b0ce64 100644
--- a/packages/trueforge-sdk/src/api/resources/agents/client/Client.ts
+++ b/packages/trueforge-sdk/src/api/resources/agents/client/Client.ts
@@ -115,6 +115,7 @@ export class AgentsClient {
      *
      * @example
      *     await client.agents.create({
+     *         description: "description",
      *         manifest: {
      *             model: {
      *                 name: "name"
diff --git a/packages/trueforge-sdk/src/api/resources/agents/client/requests/CreateAgentRequest.ts b/packages/trueforge-sdk/src/api/resources/agents/client/requests/CreateAgentRequest.ts
index 42f88b580..e62e24391 100644
--- a/packages/trueforge-sdk/src/api/resources/agents/client/requests/CreateAgentRequest.ts
+++ b/packages/trueforge-sdk/src/api/resources/agents/client/requests/CreateAgentRequest.ts
@@ -5,6 +5,7 @@ import type * as TrueForge from "../../../../index.js";
 /**
  * @example
  *     {
+ *         description: "description",
  *         manifest: {
  *             model: {
  *                 name: "name"
@@ -15,7 +16,7 @@ import type * as TrueForge from "../../../../index.js";
  */
 export interface CreateAgentRequest {
     /** Short summary of what the agent does. */
-    description?: string;
+    description: string;
     manifest: TrueForge.AgentSpec;
     name: TrueForge.ResourceName;
 }
diff --git a/packages/trueforge-sdk/src/serialization/resources/agents/client/requests/CreateAgentRequest.ts b/packages/trueforge-sdk/src/serialization/resources/agents/client/requests/CreateAgentRequest.ts
index 93993fa7c..1fff2647c 100644
--- a/packages/trueforge-sdk/src/serialization/resources/agents/client/requests/CreateAgentRequest.ts
+++ b/packages/trueforge-sdk/src/serialization/resources/agents/client/requests/CreateAgentRequest.ts
@@ -10,14 +10,14 @@ export const CreateAgentRequest: core.serialization.Schema<
     serializers.CreateAgentRequest.Raw,
     TrueForge.CreateAgentRequest
 > = core.serialization.object({
-    description: core.serialization.string().optional(),
+    description: core.serialization.string(),
     manifest: AgentSpec,
     name: ResourceName,
 });
 
 export declare namespace CreateAgentRequest {
     export interface Raw {
-        description?: string | null;
+        description: string;
         manifest: AgentSpec.Raw;
         name: ResourceName.Raw;
     }
diff --git a/packages/trueforge-sdk/tests/wire/agents.test.ts b/packages/trueforge-sdk/tests/wire/agents.test.ts
index b6cec38fd..62ff88e92 100644
--- a/packages/trueforge-sdk/tests/wire/agents.test.ts
+++ b/packages/trueforge-sdk/tests/wire/agents.test.ts
@@ -65,7 +65,7 @@ describe("AgentsClient", () => {
     test("create (1)", async () => {
         const server = mockServerPool.createServer();
         const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
-        const rawRequestBody = { manifest: { model: { name: "name" } }, name: "name" };
+        const rawRequestBody = { description: "description", manifest: { model: { name: "name" } }, name: "name" };
         const rawResponseBody = {
             data: {
                 created_by_subject: {
@@ -97,6 +97,7 @@ describe("AgentsClient", () => {
             .build();
 
         const response = await client.agents.create({
+            description: "description",
             manifest: {
                 model: {
                     name: "name",
@@ -146,7 +147,7 @@ describe("AgentsClient", () => {
     test("create (2)", async () => {
         const server = mockServerPool.createServer();
         const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
-        const rawRequestBody = { manifest: { model: { name: "x" } }, name: "xy" };
+        const rawRequestBody = { description: "x", manifest: { model: { name: "x" } }, name: "xy" };
         const rawResponseBody = { error: { message: "message" } };
 
         server
@@ -160,6 +161,7 @@ describe("AgentsClient", () => {
 
         await expect(async () => {
             return await client.agents.create({
+                description: "x",
                 manifest: {
                     model: {
                         name: "x",
@@ -173,7 +175,7 @@ describe("AgentsClient", () => {
     test("create (3)", async () => {
         const server = mockServerPool.createServer();
         const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
-        const rawRequestBody = { manifest: { model: { name: "x" } }, name: "xy" };
+        const rawRequestBody = { description: "x", manifest: { model: { name: "x" } }, name: "xy" };
         const rawResponseBody = { error: { message: "message" } };
 
         server
@@ -187,6 +189,7 @@ describe("AgentsClient", () => {
 
         await expect(async () => {
             return await client.agents.create({
+                description: "x",
                 manifest: {
                     model: {
                         name: "x",
@@ -200,7 +203,7 @@ describe("AgentsClient", () => {
     test("create (4)", async () => {
         const server = mockServerPool.createServer();
         const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
-        const rawRequestBody = { manifest: { model: { name: "x" } }, name: "xy" };
+        const rawRequestBody = { description: "x", manifest: { model: { name: "x" } }, name: "xy" };
         const rawResponseBody = { error: { message: "message" } };
 
         server
@@ -214,6 +217,7 @@ describe("AgentsClient", () => {
 
         await expect(async () => {
             return await client.agents.create({
+                description: "x",
                 manifest: {
                     model: {
                         name: "x",

From af0f972efbf4b8a615551a852ad96d10ba320fff Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Fri, 11 Sep 2026 15:21:39 +0530
Subject: [PATCH 2/9] Chore: Add agent description support in UI

---
 .changeset/agent-description-ui.md            |   5 +
 .../trueforge-ui/src/atoms/AgentsLibrary.tsx  |  27 +-
 .../src/atoms/SaveAgentButton.tsx             |   1 +
 .../trueforge-ui/src/atoms/SaveAgentForm.tsx  |  32 +-
 .../src/atoms/agent-details/AgentOverview.tsx | 288 +++++++++---------
 .../atoms/agent-details/AgentOverviewCard.tsx |   2 +-
 .../src/atoms/agent-details/types.ts          |   2 +-
 .../agentSessionsServer.ts                    |   3 +-
 .../builderServer.ts                          |  19 +-
 .../chatServer.ts                             |   4 +-
 .../test/atoms/AgentDetailsPage.test.tsx      |   2 +
 .../test/atoms/AgentsLibrary.test.tsx         |   7 +-
 .../test/atoms/SaveAgentButton.test.tsx       |  43 ++-
 .../agentSessionsServer.test.ts               |   7 +-
 .../harnessBuilderServer.test.ts              |  50 ++-
 15 files changed, 322 insertions(+), 170 deletions(-)
 create mode 100644 .changeset/agent-description-ui.md

diff --git a/.changeset/agent-description-ui.md b/.changeset/agent-description-ui.md
new file mode 100644
index 000000000..41547498f
--- /dev/null
+++ b/.changeset/agent-description-ui.md
@@ -0,0 +1,5 @@
+---
+"@truefoundry/trueforge-ui": patch
+---
+
+Round-trip agent description through save/load and show it in the library and agent details.
diff --git a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
index 086b103cf..35d0f5772 100644
--- a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
+++ b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
@@ -177,6 +177,7 @@ export function AgentLibraryRow({
   const skillsTitle = skillNames.length ? skillNames.join(', ') : `${skillsCount} skills`;
   const hasConfiguration = modelLabel != null || skillsCount > 0 || mcpCount > 0;
   const hasNoSchedules = scheduleSummary != null && scheduleSummary.count === 0;
+  const description = spec?.description?.trim() ? spec.description : null;
 
   return (
     <TableRow className={hasNoSchedules ? 'group' : undefined}>
@@ -194,6 +195,17 @@ export function AgentLibraryRow({
           </button>
         )}
       </TableCell>
+      <TableCell>
+        {description ? (
+          <span className="block truncate text-xs" title={description}>
+            {description}
+          </span>
+        ) : (
+          <span className="text-sm" aria-label={`No description for ${agent.name}`}>
+            —
+          </span>
+        )}
+      </TableCell>
       <TableCell>
         {hasConfiguration ? (
           <div className="text-text-secondary flex min-w-0 items-center gap-2">
@@ -254,7 +266,7 @@ export function AgentLibraryRow({
           )}
         </TableCell>
       ) : null}
-      <TableCell className="w-px">
+      <TableCell>
         <div className="flex items-center justify-end gap-1.5">
           <PermissionGuard allowed={canUseAgent}>
             <Button.Secondary type="button" aria-label={`Try agent ${agent.name}`} size="large" onClick={onTry}>
@@ -474,14 +486,15 @@ export function AgentsLibrary({ onSelectAgent }: AgentsLibraryProps) {
           ) : (
             <>
               <div className="overflow-hidden rounded-lg border border-border">
-                <Table>
+                <Table className="table-fixed">
                   <TableHeader>
                     <TableRow className="hover:bg-transparent">
-                      <TableHead>Agent name</TableHead>
-                      <TableHead>Configuration</TableHead>
-                      {showCreatedByColumn ? <TableHead>Created by</TableHead> : null}
-                      {showSchedulesColumn ? <TableHead className="w-[14rem]">Schedules</TableHead> : null}
-                      <TableHead className="w-px">
+                      <TableHead className="w-64">Agent name</TableHead>
+                      <TableHead>Description</TableHead>
+                      <TableHead className="w-64">Configuration</TableHead>
+                      {showCreatedByColumn ? <TableHead className="w-56">Created by</TableHead> : null}
+                      {showSchedulesColumn ? <TableHead className="w-64">Schedules</TableHead> : null}
+                      <TableHead className="w-32">
                         <span className="sr-only">Actions</span>
                       </TableHead>
                     </TableRow>
diff --git a/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx b/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
index e9c5c4fe8..81bae6ba8 100644
--- a/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
+++ b/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
@@ -120,6 +120,7 @@ function SaveAgentButtonContent({
     if (intent === 'update' && !canManageAgent) return;
     const normalizedName = name.trim();
     if (!normalizedName || !draftSpec.model.name.trim()) return;
+    if (intent === 'create' && !(draftSpec.description?.trim() ?? '')) return;
     setSaving(true);
     setError(null);
     try {
diff --git a/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx b/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
index 8c6d0f236..8a7dc0ad9 100644
--- a/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
+++ b/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
@@ -25,6 +25,7 @@ export function SaveAgentForm({
   saving,
   error,
   onNameChange,
+  onChange,
   onCancel,
   onSave,
 }: SaveAgentFormProps) {
@@ -36,6 +37,11 @@ export function SaveAgentForm({
     errorRef.current?.scrollIntoView?.({ block: 'nearest', behavior: 'smooth' });
   }, [error]);
 
+  const canSave =
+    name.trim() !== '' &&
+    spec.model.name.trim() !== '' &&
+    (intent === 'update' || (spec.description?.trim() ?? '') !== '');
+
   return (
     <div className="flex min-h-0 w-full flex-1 flex-col">
       <div className="min-h-0 flex-1 overflow-y-auto px-5 py-3">
@@ -50,18 +56,18 @@ export function SaveAgentForm({
           />
         </label>
 
-        {/* TODO: Uncomment the description field when the backend supports description */}
-        {/* <label className="mb-3 block">
-            <span className="mb-1.5 block text-sm font-medium">Description</span>
-            <textarea
-              value={spec.description ?? ''}
-              disabled={saving}
-              onChange={event => onChange({ ...spec, description: event.target.value })}
-              rows={4}
-              placeholder="Describe what this agent does."
-              className={auiInputClass('resize-y py-2 disabled:opacity-60')}
-            />
-          </label> */}
+        <label className="mb-3 block">
+          <span className="mb-1.5 block text-sm font-medium">Description</span>
+          <textarea
+            value={spec.description ?? ''}
+            disabled={saving}
+            onChange={event => onChange({ ...spec, description: event.target.value })}
+            rows={4}
+            maxLength={1024}
+            placeholder="Describe what this agent does."
+            className={auiInputClass('resize-y py-2 disabled:opacity-60')}
+          />
+        </label>
 
         {error ? (
           <p
@@ -78,7 +84,7 @@ export function SaveAgentForm({
         <Button.Secondary type="button" disabled={saving} onClick={onCancel}>
           Cancel
         </Button.Secondary>
-        <Button.Primary type="button" disabled={saving || !name.trim() || !spec.model.name.trim()} onClick={onSave}>
+        <Button.Primary type="button" disabled={saving || !canSave} onClick={onSave}>
           {saving ? 'Saving…' : 'Save changes'}
         </Button.Primary>
       </div>
diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
index 952b02e5c..c64374976 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
@@ -52,6 +52,7 @@ export default function AgentOverview({ detail }: AgentOverviewProps) {
   const config = isRecord(spec.config) ? spec.config : null;
   const sandbox = isRecord(config?.sandbox) ? config.sandbox : null;
   const instructions = spec.instructions?.trim() ? spec.instructions : null;
+  const description = spec.description?.trim() ? spec.description : null;
   const execution = [
     ['Sandbox', typeof sandbox?.enabled === 'boolean' ? (sandbox.enabled ? 'Enabled' : 'Disabled') : undefined],
     ['Iteration limit', readRecordValue(config, 'iterationLimit', 'iteration_limit')],
@@ -67,152 +68,163 @@ export default function AgentOverview({ detail }: AgentOverviewProps) {
   const toggleLabel = instructionsView === 'markdown' ? 'Raw' : 'Markdown';
 
   return (
-    <div className="grid min-h-0 flex-1 gap-3 overflow-auto p-4 md:grid-cols-[minmax(0,1fr)_18rem] md:overflow-hidden">
-      <section className="flex min-h-64 flex-col rounded-lg border border-border bg-card-bg p-4 text-text-primary">
-        <div className="mb-3 flex shrink-0 items-center justify-between gap-2">
-          <h2 className="flex items-center gap-1.5 text-sm font-semibold text-text-primary">
-            <Icon name="book-open" className="size-4 text-text-secondary" />
-            Instructions
-          </h2>
-          {instructions ? (
-            <div
-              className="inline-flex h-7 items-stretch overflow-hidden rounded-md border border-border bg-primary-bg text-xs font-medium text-text-secondary"
-              role="group"
-              aria-label="Instructions actions"
-            >
-              <button
-                type="button"
-                aria-label={`Show ${toggleLabel}`}
-                onClick={() => setInstructionsView(view => (view === 'markdown' ? 'raw' : 'markdown'))}
-                className="cursor-pointer px-2.5 transition-colors hover:bg-ghost-button-hover hover:text-text-primary"
-              >
-                {toggleLabel}
-              </button>
-              <span className="w-px self-stretch bg-border" aria-hidden />
-              <button
-                type="button"
-                title={copied ? 'Copied!' : 'Copy'}
-                aria-label={copied ? 'Copied!' : 'Copy'}
-                onClick={() => {
-                  void navigator.clipboard.writeText(instructions).then(() => {
-                    setCopied(true);
-                    setTimeout(() => setCopied(false), 2000);
-                  });
-                }}
-                className="inline-flex cursor-pointer items-center justify-center px-2 transition-colors hover:bg-ghost-button-hover hover:text-text-primary"
-              >
-                <Icon name={copied ? 'check' : 'copy'} size={12} />
-              </button>
-            </div>
-          ) : null}
-        </div>
-        <div className="min-h-0 flex-1 overflow-auto">
-          {instructions ? (
-            instructionsView === 'markdown' ? (
-              <Markdown content={instructions} readOnly className="text-sm" />
-            ) : (
-              <pre className="whitespace-pre-wrap break-words font-mono text-sm text-text-primary">{instructions}</pre>
-            )
-          ) : (
-            <p className="text-sm text-text-secondary">No instructions for this agent.</p>
-          )}
+    <div className="flex min-h-0 flex-1 flex-col gap-3 overflow-auto p-4 md:overflow-hidden">
+      {description ? (
+        <div className="shrink-0">
+          <AgentOverviewCard title="Description">
+            <p className="text-sm text-text-secondary">{description}</p>
+          </AgentOverviewCard>
         </div>
-      </section>
-
-      <aside className="flex min-h-0 min-w-0 flex-col gap-3 md:overflow-auto">
-        <AgentOverviewCard title="Model Configuration" icon="cpu">
-          <dl className="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 gap-y-1 text-xs">
-            <dt className="text-text-secondary">Model</dt>
-            <dd className={cn(valueClassName, 'truncate')} title={spec.model.name}>
-              {displayModelName(spec.model.name)}
-            </dd>
-            {typeof maxTokens === 'number' ? (
-              <>
-                <dt className="text-text-secondary">Max tokens</dt>
-                <dd className={valueClassName}>{maxTokens}</dd>
-              </>
-            ) : null}
-            {spec.model.params?.reasoningEffort !== undefined ? (
-              <>
-                <dt className="text-text-secondary">Reasoning</dt>
-                <dd className={valueClassName}>{spec.model.params.reasoningEffort}</dd>
-              </>
-            ) : null}
-            {typeof temperature === 'number' ? (
-              <>
-                <dt className="text-text-secondary">Temperature</dt>
-                <dd className={valueClassName}>{temperature}</dd>
-              </>
-            ) : null}
-          </dl>
-        </AgentOverviewCard>
-        <AgentOverviewCard title="MCP Servers" icon="plug" count={connectors.length}>
-          {connectors.length === 0 ? (
-            <p className="text-xs text-text-secondary">No connectors attached.</p>
-          ) : (
-            <ul className="space-y-1.5">
-              {connectors.map((connector, index) => (
-                <li
-                  key={`${readName(connector) ?? 'connector'}-${index}`}
-                  className="rounded-md bg-secondary-bg px-2 py-1.5 text-xs"
+      ) : null}
+      <div className="grid min-h-0 flex-1 gap-3 md:grid-cols-[minmax(0,1fr)_18rem] md:overflow-hidden">
+        <section className="flex min-h-64 flex-col rounded-lg border border-border bg-card-bg p-4 text-text-primary">
+          <div className="mb-3 flex shrink-0 items-center justify-between gap-2">
+            <h2 className="flex items-center gap-1.5 text-sm font-semibold text-text-primary">
+              <Icon name="book-open" className="size-4 text-text-secondary" />
+              Instructions
+            </h2>
+            {instructions ? (
+              <div
+                className="inline-flex h-7 items-stretch overflow-hidden rounded-md border border-border bg-primary-bg text-xs font-medium text-text-secondary"
+                role="group"
+                aria-label="Instructions actions"
+              >
+                <button
+                  type="button"
+                  aria-label={`Show ${toggleLabel}`}
+                  onClick={() => setInstructionsView(view => (view === 'markdown' ? 'raw' : 'markdown'))}
+                  className="cursor-pointer px-2.5 transition-colors hover:bg-ghost-button-hover hover:text-text-primary"
                 >
-                  <span className="flex items-center justify-between gap-2">
-                    <span className="truncate">{readName(connector) ?? `Connector ${index + 1}`}</span>
-                    {hasAllTools(connector) ? (
-                      <span className="shrink-0 rounded-full bg-primary-button-bg/10 px-1.5 py-0.5 text-[10px] text-primary-button-bg">
-                        All tools
-                      </span>
-                    ) : null}
-                  </span>
-                </li>
-              ))}
-            </ul>
-          )}
-        </AgentOverviewCard>
-
-        <AgentOverviewCard title="Attached Skills" icon="lightbulb" count={skills.length}>
-          {skills.length === 0 ? (
-            <p className="text-xs text-text-secondary">No skills attached.</p>
-          ) : (
-            <ul className="space-y-1.5">
-              {skills.map((skill, index) => (
-                <li
-                  key={`${readName(skill) ?? 'skill'}-${index}`}
-                  className="rounded-md bg-secondary-bg px-2 py-1.5 text-xs"
+                  {toggleLabel}
+                </button>
+                <span className="w-px self-stretch bg-border" aria-hidden />
+                <button
+                  type="button"
+                  title={copied ? 'Copied!' : 'Copy'}
+                  aria-label={copied ? 'Copied!' : 'Copy'}
+                  onClick={() => {
+                    void navigator.clipboard.writeText(instructions).then(() => {
+                      setCopied(true);
+                      setTimeout(() => setCopied(false), 2000);
+                    });
+                  }}
+                  className="inline-flex cursor-pointer items-center justify-center px-2 transition-colors hover:bg-ghost-button-hover hover:text-text-primary"
                 >
-                  {readName(skill) ?? `Skill ${index + 1}`}
-                </li>
-              ))}
-            </ul>
-          )}
-        </AgentOverviewCard>
+                  <Icon name={copied ? 'check' : 'copy'} size={12} />
+                </button>
+              </div>
+            ) : null}
+          </div>
+          <div className="min-h-0 flex-1 overflow-auto">
+            {instructions ? (
+              instructionsView === 'markdown' ? (
+                <Markdown content={instructions} readOnly className="text-sm" />
+              ) : (
+                <pre className="whitespace-pre-wrap break-words font-mono text-sm text-text-primary">
+                  {instructions}
+                </pre>
+              )
+            ) : (
+              <p className="text-sm text-text-secondary">No instructions for this agent.</p>
+            )}
+          </div>
+        </section>
 
-        {execution.length > 0 ? (
-          <AgentOverviewCard title="Execution" icon="terminal">
-            <dl className="space-y-1 text-xs">
-              {execution.map(([label, value]) => (
-                <div key={label} className="flex justify-between gap-3">
-                  <dt className="text-text-secondary">{label}</dt>
-                  <dd className={valueClassName}>{value}</dd>
-                </div>
-              ))}
+        <aside className="flex min-h-0 min-w-0 flex-col gap-3 md:overflow-auto">
+          <AgentOverviewCard title="Model Configuration" icon="cpu">
+            <dl className="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 gap-y-1 text-xs">
+              <dt className="text-text-secondary">Model</dt>
+              <dd className={cn(valueClassName, 'truncate')} title={spec.model.name}>
+                {displayModelName(spec.model.name)}
+              </dd>
+              {typeof maxTokens === 'number' ? (
+                <>
+                  <dt className="text-text-secondary">Max tokens</dt>
+                  <dd className={valueClassName}>{maxTokens}</dd>
+                </>
+              ) : null}
+              {spec.model.params?.reasoningEffort !== undefined ? (
+                <>
+                  <dt className="text-text-secondary">Reasoning</dt>
+                  <dd className={valueClassName}>{spec.model.params.reasoningEffort}</dd>
+                </>
+              ) : null}
+              {typeof temperature === 'number' ? (
+                <>
+                  <dt className="text-text-secondary">Temperature</dt>
+                  <dd className={valueClassName}>{temperature}</dd>
+                </>
+              ) : null}
             </dl>
           </AgentOverviewCard>
-        ) : null}
+          <AgentOverviewCard title="MCP Servers" icon="plug" count={connectors.length}>
+            {connectors.length === 0 ? (
+              <p className="text-xs text-text-secondary">No connectors attached.</p>
+            ) : (
+              <ul className="space-y-1.5">
+                {connectors.map((connector, index) => (
+                  <li
+                    key={`${readName(connector) ?? 'connector'}-${index}`}
+                    className="rounded-md bg-secondary-bg px-2 py-1.5 text-xs"
+                  >
+                    <span className="flex items-center justify-between gap-2">
+                      <span className="truncate">{readName(connector) ?? `Connector ${index + 1}`}</span>
+                      {hasAllTools(connector) ? (
+                        <span className="shrink-0 rounded-full bg-primary-button-bg/10 px-1.5 py-0.5 text-[10px] text-primary-button-bg">
+                          All tools
+                        </span>
+                      ) : null}
+                    </span>
+                  </li>
+                ))}
+              </ul>
+            )}
+          </AgentOverviewCard>
 
-        {capabilities.length > 0 ? (
-          <AgentOverviewCard title="Capabilities" icon="cube">
-            <dl className="space-y-1 text-xs">
-              {capabilities.map(([label, enabled]) => (
-                <div key={label} className="flex justify-between gap-3">
-                  <dt className="text-text-secondary">{label}</dt>
-                  <dd className={valueClassName}>{enabled ? 'Enabled' : 'Disabled'}</dd>
-                </div>
-              ))}
-            </dl>
+          <AgentOverviewCard title="Attached Skills" icon="lightbulb" count={skills.length}>
+            {skills.length === 0 ? (
+              <p className="text-xs text-text-secondary">No skills attached.</p>
+            ) : (
+              <ul className="space-y-1.5">
+                {skills.map((skill, index) => (
+                  <li
+                    key={`${readName(skill) ?? 'skill'}-${index}`}
+                    className="rounded-md bg-secondary-bg px-2 py-1.5 text-xs"
+                  >
+                    {readName(skill) ?? `Skill ${index + 1}`}
+                  </li>
+                ))}
+              </ul>
+            )}
           </AgentOverviewCard>
-        ) : null}
-      </aside>
+
+          {execution.length > 0 ? (
+            <AgentOverviewCard title="Execution" icon="terminal">
+              <dl className="space-y-1 text-xs">
+                {execution.map(([label, value]) => (
+                  <div key={label} className="flex justify-between gap-3">
+                    <dt className="text-text-secondary">{label}</dt>
+                    <dd className={valueClassName}>{value}</dd>
+                  </div>
+                ))}
+              </dl>
+            </AgentOverviewCard>
+          ) : null}
+
+          {capabilities.length > 0 ? (
+            <AgentOverviewCard title="Capabilities" icon="cube">
+              <dl className="space-y-1 text-xs">
+                {capabilities.map(([label, enabled]) => (
+                  <div key={label} className="flex justify-between gap-3">
+                    <dt className="text-text-secondary">{label}</dt>
+                    <dd className={valueClassName}>{enabled ? 'Enabled' : 'Disabled'}</dd>
+                  </div>
+                ))}
+              </dl>
+            </AgentOverviewCard>
+          ) : null}
+        </aside>
+      </div>
     </div>
   );
 }
diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentOverviewCard.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentOverviewCard.tsx
index eb1ba46a1..97ebb8c99 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/AgentOverviewCard.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentOverviewCard.tsx
@@ -5,7 +5,7 @@ export function AgentOverviewCard({ title, icon, count, children }: AgentOvervie
   return (
     <section className="rounded-lg border border-border bg-card-bg p-3 text-text-primary">
       <h2 className="mb-2 flex items-center gap-1.5 text-xs font-semibold">
-        <Icon name={icon} className="size-3.5 text-text-secondary" />
+        {icon ? <Icon name={icon} className="size-3.5 text-text-secondary" /> : null}
         {title}
         {count !== undefined ? <span className="text-text-secondary">({count})</span> : null}
       </h2>
diff --git a/packages/trueforge-ui/src/atoms/agent-details/types.ts b/packages/trueforge-ui/src/atoms/agent-details/types.ts
index 147d5c6ec..b6e306d7d 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/types.ts
+++ b/packages/trueforge-ui/src/atoms/agent-details/types.ts
@@ -158,7 +158,7 @@ export type AgentOverviewProps = {
 
 export type AgentOverviewCardProps = {
   title: string;
-  icon: string;
+  icon?: string;
   count?: number;
   children: ReactNode;
 };
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts
index cf9c827e4..039f781fb 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts
@@ -52,7 +52,8 @@ export function createHarnessAgentSessionsServer(
       return {
         agentId: data.id,
         name: data.name,
-        agentSpec: toUiAgentSpec(data.manifest),
+        // Description is a top-level Agent field; fold into UI agentSpec for overview/edit/clone.
+        agentSpec: { ...toUiAgentSpec(data.manifest), description: data.description },
       };
     },
     async getCodeSnippets({ agentId }) {
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
index c3a3d0ee9..d25c84911 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
@@ -56,7 +56,8 @@ function toLibraryEntry(agent: TrueForgeApi.Agent): AgentLibraryEntry {
   return {
     name: agent.name,
     agentId: agent.id,
-    agentSpec: toUiAgentSpec(agent.manifest),
+    // Description is a top-level Agent field; fold into UI agentSpec for edit/clone/display.
+    agentSpec: { ...toUiAgentSpec(agent.manifest), description: agent.description },
     createdBySubject: agent.createdBySubject,
   };
 }
@@ -130,18 +131,28 @@ export function createHarnessBuilderServer(
     },
 
     async saveAgent({ agentName, agentSpec, intent }) {
-      // TODO: TrueForge currently drops AgentSpec.description until its schema supports it.
       const manifest = toHarnessAgentSpec(agentSpec);
+      const description = agentSpec.description?.trim();
       if (intent === 'update') {
         const { data } = await client.agents.list();
         const existing = data.find(agent => agent.name === agentName);
         if (!existing) {
           return {};
         }
-        await client.agents.update(existing.id, { manifest });
+        // Omit empty description on update so a reloaded draft (no description in session
+        // manifest) preserves the stored value instead of failing min(1).
+        await client.agents.update(existing.id, {
+          ...(description ? { description } : {}),
+          manifest,
+        });
         return { agentId: existing.id };
       }
-      const created = await client.agents.create({ name: agentName, manifest });
+      // Create requires description; fall back to name for clone of pre-description agents.
+      const created = await client.agents.create({
+        name: agentName,
+        description: description || agentName,
+        manifest,
+      });
       return { agentId: created.data.id };
     },
 
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
index c011102bb..a5d87cbd4 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
@@ -54,7 +54,9 @@ function toHarnessSkill(skill: HarnessSkillMount): TrueForgeApi.Skill {
 
 /** Drop UI draft `id` before admission; Harness MCP mounts are name-keyed. */
 export function toHarnessAgentSpec(spec: HarnessAgentSpec): TrueForgeApi.AgentSpec {
-  const { skills, mcpServers, ...rest } = spec;
+  // `description` is a top-level Agent field — never embed it in the session/agent manifest.
+  const { skills, mcpServers, description: _description, ...rest } = spec;
+  void _description;
   return {
     ...rest,
     ...(mcpServers === undefined
diff --git a/packages/trueforge-ui/test/atoms/AgentDetailsPage.test.tsx b/packages/trueforge-ui/test/atoms/AgentDetailsPage.test.tsx
index 8d7f31bd8..e6b31292f 100644
--- a/packages/trueforge-ui/test/atoms/AgentDetailsPage.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentDetailsPage.test.tsx
@@ -81,6 +81,7 @@ const detail: AgentDetail = {
   name: 'release-notes-writer',
   agentSpec: {
     model: { name: 'openai/gpt-5.1', params: { maxTokens: 16000 } },
+    description: 'Produces concise release notes from merged PRs.',
     instructions: '# Who you are\n\nWrite concise release notes.',
     skills: [{ name: 'release-writing' }],
     mcpServers: [{ name: 'github' }],
@@ -193,6 +194,7 @@ describe('AgentDetailsPage', () => {
     const { getAgent } = renderPage();
 
     expect(await screen.findByText('release-notes-writer')).toBeInTheDocument();
+    expect(await screen.findByText('Produces concise release notes from merged PRs.')).toBeInTheDocument();
     expect(await screen.findByText('Write concise release notes.')).toBeInTheDocument();
     expect(await screen.findByText('github')).toBeInTheDocument();
     expect(await screen.findByText('release-writing')).toBeInTheDocument();
diff --git a/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx b/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
index 3c28edcd6..3bf85eac3 100644
--- a/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
@@ -146,7 +146,11 @@ describe('AgentsLibrary', () => {
 
   it('lists agents and selects a named agent (Try = immutable)', async () => {
     const server = mockServer([
-      { name: 'alpha-agent', agentId: 'alpha-agent' },
+      {
+        name: 'alpha-agent',
+        agentId: 'alpha-agent',
+        agentSpec: { model: { name: 'openai/gpt-4.1' }, description: 'Alpha handles triage.' },
+      },
       { name: 'beta-agent', agentId: 'beta-agent' },
     ]);
     const onSelectAgent = vi.fn();
@@ -158,6 +162,7 @@ describe('AgentsLibrary', () => {
     await waitFor(() => {
       expect(screen.getByRole('button', { name: 'Try agent alpha-agent' })).toBeInTheDocument();
     });
+    expect(screen.getByText('Alpha handles triage.')).toHaveClass('truncate');
 
     fireEvent.click(screen.getByRole('button', { name: 'Try agent beta-agent' }));
     expect(onSelectAgent).toHaveBeenCalledWith('beta-agent');
diff --git a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
index 720d032fa..1cc5e13e4 100644
--- a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
+++ b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
@@ -205,7 +205,7 @@ describe('SaveAgentButton', () => {
       'text-text-primary',
       'focus-visible:ring-focus-ring/40',
     );
-    expect(within(dialog).queryByLabelText('Description')).not.toBeInTheDocument();
+    expect(within(dialog).getByLabelText('Description')).toBeInTheDocument();
     expect(within(dialog).queryByRole('button', { name: 'Edit Model' })).not.toBeInTheDocument();
     expect(within(dialog).queryByRole('button', { name: 'Edit Runtime Config' })).not.toBeInTheDocument();
     expect(within(dialog).queryByRole('button', { name: 'Edit Connectors' })).not.toBeInTheDocument();
@@ -219,6 +219,7 @@ describe('SaveAgentButton', () => {
 
     const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'writer' } });
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: 'Writes docs.' } });
     fireEvent.click(within(dialog).getByRole('button', { name: 'Save changes' }));
 
     await waitFor(() =>
@@ -255,6 +256,7 @@ describe('SaveAgentButton', () => {
 
     const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'latest-agent' } });
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: 'Latest agent description.' } });
     fireEvent.click(within(dialog).getByRole('button', { name: 'Save changes' }));
 
     await waitFor(() =>
@@ -281,6 +283,7 @@ describe('SaveAgentButton', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Save Agent' }));
     const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'writer' } });
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: 'Writes docs.' } });
     fireEvent.click(within(dialog).getByRole('button', { name: 'Save changes' }));
 
     await waitFor(() =>
@@ -307,6 +310,7 @@ describe('SaveAgentButton', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Save Agent' }));
     const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'writer' } });
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: 'Writes docs.' } });
     fireEvent.click(within(dialog).getByRole('button', { name: 'Save changes' }));
 
     expect(updateAgentSpec).toHaveBeenCalledWith({
@@ -361,6 +365,7 @@ describe('SaveAgentButton', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Save Agent' }));
     const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'my-agent' } });
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: 'My agent description.' } });
     fireEvent.click(within(dialog).getByRole('button', { name: 'Save changes' }));
 
     await waitFor(() => expect(saveAgent).toHaveBeenCalledOnce());
@@ -369,6 +374,7 @@ describe('SaveAgentButton', () => {
       agentSpec: {
         model: { name: 'openai/gpt-4.1', params: undefined },
         instructions: 'Be helpful.',
+        description: 'My agent description.',
         mcpServers: [{ id: 'github', name: 'GitHub' }],
         skills: [{ id: 'research', name: 'Research' }],
         config: undefined,
@@ -395,6 +401,9 @@ describe('SaveAgentButton', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Save Agent' }));
     const saveDialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(saveDialog).getByLabelText('Agent name'), { target: { value: 'preserved-agent' } });
+    fireEvent.change(within(saveDialog).getByLabelText('Description'), {
+      target: { value: 'Preserved agent description.' },
+    });
     fireEvent.click(within(saveDialog).getByRole('button', { name: 'Save changes' }));
 
     await waitFor(() => expect(saveAgent).toHaveBeenCalledOnce());
@@ -414,6 +423,7 @@ describe('SaveAgentButton', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Save Agent' }));
     const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'pending-agent' } });
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: 'Pending agent description.' } });
     fireEvent.click(within(dialog).getByRole('button', { name: 'Save changes' }));
 
     expect(within(dialog).getByLabelText('Agent name')).toBeDisabled();
@@ -432,6 +442,9 @@ describe('SaveAgentButton', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Save Agent' }));
     const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'duplicate' } });
+    fireEvent.change(within(dialog).getByLabelText('Description'), {
+      target: { value: 'Duplicate agent description.' },
+    });
     fireEvent.click(within(dialog).getByRole('button', { name: 'Save changes' }));
 
     expect(await within(dialog).findByRole('alert')).toHaveTextContent('Agent name already exists');
@@ -452,10 +465,38 @@ describe('SaveAgentButton', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Save Agent' }));
     const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
     fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'bad name' } });
+    fireEvent.change(within(dialog).getByLabelText('Description'), {
+      target: { value: 'Bad name agent description.' },
+    });
     fireEvent.click(within(dialog).getByRole('button', { name: 'Save changes' }));
 
     const alert = await within(dialog).findByRole('alert');
     expect(alert).toHaveClass('whitespace-pre-wrap');
     expect(alert.textContent).toBe('line one\nline two\tindented');
   });
+
+  it('disables Save on create when description is empty', async () => {
+    renderButton();
+    fireEvent.click(screen.getByRole('button', { name: 'Save Agent' }));
+    const dialog = await screen.findByRole('dialog', { name: 'Save agent' });
+    fireEvent.change(within(dialog).getByLabelText('Agent name'), { target: { value: 'writer' } });
+    expect(within(dialog).getByRole('button', { name: 'Save changes' })).toBeDisabled();
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: 'Writes docs.' } });
+    expect(within(dialog).getByRole('button', { name: 'Save changes' })).toBeEnabled();
+  });
+
+  it('prefills description on update intent', async () => {
+    agentSpec = {
+      model: { name: 'openai/gpt-4.1' },
+      instructions: 'Be helpful.',
+      description: 'Existing agent summary.',
+    };
+    renderButton({
+      children: <BoundMutableSaveButton agentId="writer" agentName="writer" />,
+    });
+    fireEvent.click(await screen.findByRole('button', { name: 'Update Agent' }));
+    const dialog = await screen.findByRole('dialog', { name: 'Update agent' });
+    expect(within(dialog).getByLabelText('Agent name')).toHaveValue('writer');
+    expect(within(dialog).getByLabelText('Description')).toHaveValue('Existing agent summary.');
+  });
 });
diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts
index 8a9b72f48..021b91a64 100644
--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts
+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts
@@ -11,6 +11,7 @@ describe('createHarnessAgentSessionsServer', () => {
       data: {
         id: 'agent-1',
         name: 'writer',
+        description: 'Writes docs.',
         manifest: { model: { name: 'openai/gpt-5' }, instructions: 'Write.' },
       },
     }));
@@ -37,7 +38,11 @@ describe('createHarnessAgentSessionsServer', () => {
     assert.deepEqual(await server.getAgent({ agentId: 'agent-1' }), {
       agentId: 'agent-1',
       name: 'writer',
-      agentSpec: { model: { name: 'openai/gpt-5' }, instructions: 'Write.' },
+      agentSpec: {
+        model: { name: 'openai/gpt-5' },
+        instructions: 'Write.',
+        description: 'Writes docs.',
+      },
     });
     assert.deepEqual(await server.getCodeSnippets({ agentId: 'agent-1' }), [
       {
diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
index ce1a8d630..283bac412 100644
--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
@@ -300,6 +300,7 @@ describe('harnessBuilderServer', () => {
             {
               id: 'agt_1',
               name: 'reviewer',
+              description: 'Reviews pull requests.',
               created_by_subject: {
                 subject_id: 'user-1',
                 subject_type: 'user',
@@ -312,7 +313,12 @@ describe('harnessBuilderServer', () => {
                 mcp_servers: [{ name: 'github', enable_tools: ['@all'] }],
               },
             },
-            { id: 'agt_2', name: 'writer', manifest: { model: { name: 'test/model' } } },
+            {
+              id: 'agt_2',
+              name: 'writer',
+              description: 'Writes docs.',
+              manifest: { model: { name: 'test/model' } },
+            },
           ],
         });
       }
@@ -332,6 +338,7 @@ describe('harnessBuilderServer', () => {
       },
       agentSpec: {
         model: { name: 'test/model' },
+        description: 'Reviews pull requests.',
         instructions: 'Review carefully.',
         skills: [{ name: 'review', preload: false }],
         mcpServers: [{ name: 'github', enableTools: ['@all'] }],
@@ -376,6 +383,47 @@ describe('harnessBuilderServer', () => {
     assert.deepEqual(result, { agentId: 'agt_new' });
     assert.deepEqual(requests.at(-1)?.body, {
       name: 'saved-agent',
+      description: 'saved-agent',
+      manifest: {
+        model: { name: 'test/model' },
+        skills: [{ name: 'review', preload: false }],
+      },
+    });
+  });
+
+  it('saveAgent create sends top-level description and strips it from the manifest', async () => {
+    const requests: { method: string; url: string; body?: unknown }[] = [];
+    const fetchMock: typeof fetch = async (input, init) => {
+      const url = input instanceof Request ? input.url : String(input);
+      const method = init?.method ?? 'GET';
+      if (url.endsWith('/api/v1/agents') && method === 'POST' && typeof init?.body === 'string') {
+        requests.push({ method, url, body: JSON.parse(init.body) });
+        return Response.json({
+          data: {
+            id: 'agt_desc',
+            name: 'described-agent',
+            description: 'Helps with reviews.',
+            manifest: { model: { name: 'test/model' } },
+          },
+        });
+      }
+      return new Response(`Unexpected request: ${method} ${url}`, { status: 500 });
+    };
+
+    const builder = createHarnessBuilderServer({ fetch: fetchMock });
+    await builder.saveAgent({
+      agentName: 'described-agent',
+      agentSpec: {
+        model: { name: 'test/model' },
+        description: 'Helps with reviews.',
+        skills: [{ name: 'review' }],
+      },
+      intent: 'create',
+    });
+
+    assert.deepEqual(requests.at(-1)?.body, {
+      name: 'described-agent',
+      description: 'Helps with reviews.',
       manifest: {
         model: { name: 'test/model' },
         skills: [{ name: 'review', preload: false }],

From f99e95907871ea4e3f635faa161e327749b9d5de Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Fri, 11 Sep 2026 15:51:07 +0530
Subject: [PATCH 3/9] Enhancement: Implement support for agent descriptions
 across UI components

---
 .../src/atoms/AgentOverflowMenu.tsx            |  3 +++
 .../trueforge-ui/src/atoms/AgentsLibrary.tsx   |  4 +++-
 .../trueforge-ui/src/atoms/SaveAgentButton.tsx | 11 ++++++++++-
 .../trueforge-ui/src/atoms/SaveAgentForm.tsx   | 12 +++++++-----
 .../atoms/agent-details/AgentDetailsHeader.tsx |  2 ++
 .../src/atoms/agent-details/AgentOverview.tsx  |  2 +-
 .../agentSessionsServer.ts                     |  4 ++--
 .../builderServer.ts                           |  8 ++++----
 .../chatServer.ts                              |  4 +---
 .../src/server/ShellModeContext.tsx            |  9 +++++++--
 .../test/atoms/AgentDetailsPage.test.tsx       |  2 +-
 .../test/atoms/AgentsLibrary.test.tsx          |  7 +++++--
 .../test/atoms/SaveAgentButton.test.tsx        | 18 +++++++++++++-----
 .../agentSessionsServer.test.ts                |  2 +-
 .../harnessBuilderServer.test.ts               |  4 ++--
 15 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/packages/trueforge-ui/src/atoms/AgentOverflowMenu.tsx b/packages/trueforge-ui/src/atoms/AgentOverflowMenu.tsx
index c58d8352e..66ab7be54 100644
--- a/packages/trueforge-ui/src/atoms/AgentOverflowMenu.tsx
+++ b/packages/trueforge-ui/src/atoms/AgentOverflowMenu.tsx
@@ -20,6 +20,7 @@ export function cloneAgentName(agentName: string): string {
 
 export type AgentOverflowMenuProps = {
   agentName: string;
+  description?: string;
   agentSpec?: AgentSpec;
   /** Edit / Clone / Delete when composer is enabled. */
   canMutate: boolean;
@@ -37,6 +38,7 @@ type PendingAction = 'clone' | 'delete' | null;
 
 export function AgentOverflowMenu({
   agentName,
+  description,
   agentSpec,
   canMutate,
   canUse = true,
@@ -72,6 +74,7 @@ export function AgentOverflowMenu({
     try {
       await builder.saveAgent({
         agentName: clonedName,
+        ...(description === undefined ? {} : { description }),
         agentSpec,
         intent: 'create',
       });
diff --git a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
index 35d0f5772..0e526f362 100644
--- a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
+++ b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
@@ -177,7 +177,7 @@ export function AgentLibraryRow({
   const skillsTitle = skillNames.length ? skillNames.join(', ') : `${skillsCount} skills`;
   const hasConfiguration = modelLabel != null || skillsCount > 0 || mcpCount > 0;
   const hasNoSchedules = scheduleSummary != null && scheduleSummary.count === 0;
-  const description = spec?.description?.trim() ? spec.description : null;
+  const description = agent.description?.trim() ? agent.description : null;
 
   return (
     <TableRow className={hasNoSchedules ? 'group' : undefined}>
@@ -276,6 +276,7 @@ export function AgentLibraryRow({
           </PermissionGuard>
           <AgentOverflowMenu
             agentName={agent.name}
+            {...(description != null ? { description } : {})}
             {...(spec != null ? { agentSpec: spec } : {})}
             canMutate={canMutate}
             canUse={canUseAgent}
@@ -437,6 +438,7 @@ export function AgentsLibrary({ onSelectAgent }: AgentsLibraryProps) {
       isCreateAgent: true,
       agentId: libraryAgentId(agent),
       agentName: agent.name,
+      ...(agent.description === undefined ? {} : { description: agent.description }),
       agentSpec,
     });
   };
diff --git a/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx b/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
index 81bae6ba8..4fc713640 100644
--- a/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
+++ b/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
@@ -86,6 +86,7 @@ function SaveAgentButtonContent({
   const [open, setOpen] = useState(false);
   const [intent, setIntent] = useState<SaveIntent>('create');
   const [name, setName] = useState('');
+  const [description, setDescription] = useState('');
   const [draftSpec, setDraftSpec] = useState<AgentSpec | null>(null);
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -93,6 +94,7 @@ function SaveAgentButtonContent({
   const close = () => {
     if (saving) return;
     setOpen(false);
+    setDescription('');
     setDraftSpec(null);
     setError(null);
   };
@@ -111,6 +113,7 @@ function SaveAgentButtonContent({
     const currentName = shell?.mode.status === 'active' ? (shell.mode.agentName ?? shell.mode.agentId ?? '') : '';
     setIntent(currentName ? 'update' : 'create');
     setName(currentName);
+    setDescription(currentName && shell?.mode.status === 'active' ? (shell.mode.description ?? '') : '');
     setDraftSpec(cloneAgentSpec(latestAgentSpec));
     setOpen(true);
   };
@@ -120,12 +123,14 @@ function SaveAgentButtonContent({
     if (intent === 'update' && !canManageAgent) return;
     const normalizedName = name.trim();
     if (!normalizedName || !draftSpec.model.name.trim()) return;
-    if (intent === 'create' && !(draftSpec.description?.trim() ?? '')) return;
+    const normalizedDescription = description.trim();
+    if (intent === 'create' && !normalizedDescription) return;
     setSaving(true);
     setError(null);
     try {
       const result = await builder.saveAgent({
         agentName: normalizedName,
+        ...(normalizedDescription ? { description: normalizedDescription } : {}),
         agentSpec: draftSpec,
         intent,
         sessionId: draftSessionId,
@@ -134,10 +139,12 @@ function SaveAgentButtonContent({
       shell?.bindMutableAgent({
         agentId: result.agentId ?? normalizedName,
         agentName: normalizedName,
+        ...(normalizedDescription ? { description: normalizedDescription } : {}),
         agentSpec: draftSpec,
       });
       shell?.invalidateAgentsList();
       setOpen(false);
+      setDescription('');
       setDraftSpec(null);
     } catch (caught) {
       setError(getErrorMessage(caught, 'Could not save agent'));
@@ -181,10 +188,12 @@ function SaveAgentButtonContent({
           <SaveAgentForm
             intent={intent}
             name={name}
+            description={description}
             spec={draftSpec}
             saving={saving}
             error={error}
             onNameChange={setName}
+            onDescriptionChange={setDescription}
             onChange={setDraftSpec}
             onCancel={close}
             onSave={() => void save()}
diff --git a/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx b/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
index 8a7dc0ad9..03d810a50 100644
--- a/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
+++ b/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
@@ -9,10 +9,12 @@ import { Button } from './primitives/Button.js';
 export type SaveAgentFormProps = {
   intent: 'create' | 'update';
   name: string;
+  description: string;
   spec: AgentSpec;
   saving: boolean;
   error: string | null;
   onNameChange: (name: string) => void;
+  onDescriptionChange: (description: string) => void;
   onChange: (spec: AgentSpec) => void;
   onCancel: () => void;
   onSave: () => void;
@@ -21,10 +23,12 @@ export type SaveAgentFormProps = {
 export function SaveAgentForm({
   intent,
   name,
+  description,
   spec,
   saving,
   error,
   onNameChange,
+  onDescriptionChange,
   onChange,
   onCancel,
   onSave,
@@ -38,9 +42,7 @@ export function SaveAgentForm({
   }, [error]);
 
   const canSave =
-    name.trim() !== '' &&
-    spec.model.name.trim() !== '' &&
-    (intent === 'update' || (spec.description?.trim() ?? '') !== '');
+    name.trim() !== '' && spec.model.name.trim() !== '' && (intent === 'update' || description.trim() !== '');
 
   return (
     <div className="flex min-h-0 w-full flex-1 flex-col">
@@ -59,9 +61,9 @@ export function SaveAgentForm({
         <label className="mb-3 block">
           <span className="mb-1.5 block text-sm font-medium">Description</span>
           <textarea
-            value={spec.description ?? ''}
+            value={description}
             disabled={saving}
-            onChange={event => onChange({ ...spec, description: event.target.value })}
+            onChange={event => onDescriptionChange(event.target.value)}
             rows={4}
             maxLength={1024}
             placeholder="Describe what this agent does."
diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentDetailsHeader.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentDetailsHeader.tsx
index 617070bb2..3125c0431 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/AgentDetailsHeader.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentDetailsHeader.tsx
@@ -38,6 +38,7 @@ export function AgentDetailsHeader({ agentId, detail, onBack }: AgentDetailsHead
       isCreateAgent: true,
       agentId: detail.agentId,
       agentName: detail.name,
+      ...(detail.description === undefined ? {} : { description: detail.description }),
       agentSpec: detail.agentSpec,
     });
   };
@@ -82,6 +83,7 @@ export function AgentDetailsHeader({ agentId, detail, onBack }: AgentDetailsHead
           {detail != null ? (
             <AgentOverflowMenu
               agentName={detail.name}
+              {...(detail.description === undefined ? {} : { description: detail.description })}
               agentSpec={detail.agentSpec}
               canMutate={canMutate}
               canUse={canUse}
diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
index c64374976..c226faf25 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
@@ -52,7 +52,7 @@ export default function AgentOverview({ detail }: AgentOverviewProps) {
   const config = isRecord(spec.config) ? spec.config : null;
   const sandbox = isRecord(config?.sandbox) ? config.sandbox : null;
   const instructions = spec.instructions?.trim() ? spec.instructions : null;
-  const description = spec.description?.trim() ? spec.description : null;
+  const description = detail.description?.trim() ? detail.description : null;
   const execution = [
     ['Sandbox', typeof sandbox?.enabled === 'boolean' ? (sandbox.enabled ? 'Enabled' : 'Disabled') : undefined],
     ['Iteration limit', readRecordValue(config, 'iterationLimit', 'iteration_limit')],
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts
index 039f781fb..2d40f6b83 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/agentSessionsServer.ts
@@ -52,8 +52,8 @@ export function createHarnessAgentSessionsServer(
       return {
         agentId: data.id,
         name: data.name,
-        // Description is a top-level Agent field; fold into UI agentSpec for overview/edit/clone.
-        agentSpec: { ...toUiAgentSpec(data.manifest), description: data.description },
+        description: data.description,
+        agentSpec: toUiAgentSpec(data.manifest),
       };
     },
     async getCodeSnippets({ agentId }) {
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
index d25c84911..61e28e0dc 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
@@ -56,8 +56,8 @@ function toLibraryEntry(agent: TrueForgeApi.Agent): AgentLibraryEntry {
   return {
     name: agent.name,
     agentId: agent.id,
-    // Description is a top-level Agent field; fold into UI agentSpec for edit/clone/display.
-    agentSpec: { ...toUiAgentSpec(agent.manifest), description: agent.description },
+    description: agent.description,
+    agentSpec: toUiAgentSpec(agent.manifest),
     createdBySubject: agent.createdBySubject,
   };
 }
@@ -130,9 +130,9 @@ export function createHarnessBuilderServer(
       return filtered.slice(offset, offset + limit).map(toLibraryEntry);
     },
 
-    async saveAgent({ agentName, agentSpec, intent }) {
+    async saveAgent({ agentName, description: descriptionRaw, agentSpec, intent }) {
       const manifest = toHarnessAgentSpec(agentSpec);
-      const description = agentSpec.description?.trim();
+      const description = descriptionRaw?.trim();
       if (intent === 'update') {
         const { data } = await client.agents.list();
         const existing = data.find(agent => agent.name === agentName);
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
index a5d87cbd4..c011102bb 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
@@ -54,9 +54,7 @@ function toHarnessSkill(skill: HarnessSkillMount): TrueForgeApi.Skill {
 
 /** Drop UI draft `id` before admission; Harness MCP mounts are name-keyed. */
 export function toHarnessAgentSpec(spec: HarnessAgentSpec): TrueForgeApi.AgentSpec {
-  // `description` is a top-level Agent field — never embed it in the session/agent manifest.
-  const { skills, mcpServers, description: _description, ...rest } = spec;
-  void _description;
+  const { skills, mcpServers, ...rest } = spec;
   return {
     ...rest,
     ...(mcpServers === undefined
diff --git a/packages/trueforge-ui/src/server/ShellModeContext.tsx b/packages/trueforge-ui/src/server/ShellModeContext.tsx
index 9d8901953..0d06fdf8f 100644
--- a/packages/trueforge-ui/src/server/ShellModeContext.tsx
+++ b/packages/trueforge-ui/src/server/ShellModeContext.tsx
@@ -50,6 +50,8 @@ export type ShellMode =
       agentId?: string;
       /** Display / welcome label (often same as agentId). */
       agentName?: string;
+      /** Published-agent description, kept outside the executable agent spec. */
+      description?: string;
       /** Seed for mutable (draft) runtime. */
       agentSpec?: AgentSpec;
       locked: boolean;
@@ -64,6 +66,7 @@ export type SelectLibraryAgentRequest = {
   isCreateAgent?: boolean;
   agentId?: string;
   agentName?: string;
+  description?: string;
   agentSpec?: AgentSpec;
 };
 
@@ -111,7 +114,7 @@ type ShellModeContextValue = {
    * Attach identity + agentSpec to the *current* mutable chat without remounting.
    * Used after `saveAgent` so the same draft session continues as an editable agent.
    */
-  bindMutableAgent: (req: { agentId: string; agentName: string; agentSpec: AgentSpec }) => void;
+  bindMutableAgent: (req: { agentId: string; agentName: string; description?: string; agentSpec: AgentSpec }) => void;
   /** @deprecated Prefer `selectLibraryAgent({ isMutable: false, agentName })`. */
   selectAgent: (agentName: string) => void;
   /** Open a simple New Chat (mutable, no agent-builder chrome). */
@@ -411,6 +414,7 @@ export function ShellModeProvider({
           isCreateAgent,
           agentId: req.agentId,
           agentName: req.agentName,
+          description: req.description,
           agentSpec: req.agentSpec ?? (kind === 'agent' ? agentSeedRef.current : chatSeedRef.current),
           locked: false,
         });
@@ -451,7 +455,7 @@ export function ShellModeProvider({
   );
 
   const bindMutableAgent = useCallback(
-    (req: { agentId: string; agentName: string; agentSpec: AgentSpec }) => {
+    (req: { agentId: string; agentName: string; description?: string; agentSpec: AgentSpec }) => {
       if (!isComposerEnabled) return;
       setMode(prev => {
         if (prev.status !== 'active' || !prev.isMutable) return prev;
@@ -461,6 +465,7 @@ export function ShellModeProvider({
           isCreateAgent: true,
           agentId: req.agentId,
           agentName: req.agentName,
+          description: req.description,
           agentSpec: req.agentSpec,
           locked: false,
         };
diff --git a/packages/trueforge-ui/test/atoms/AgentDetailsPage.test.tsx b/packages/trueforge-ui/test/atoms/AgentDetailsPage.test.tsx
index e6b31292f..31b0931b7 100644
--- a/packages/trueforge-ui/test/atoms/AgentDetailsPage.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentDetailsPage.test.tsx
@@ -79,9 +79,9 @@ beforeAll(() => {
 const detail: AgentDetail = {
   agentId: 'agent-1',
   name: 'release-notes-writer',
+  description: 'Produces concise release notes from merged PRs.',
   agentSpec: {
     model: { name: 'openai/gpt-5.1', params: { maxTokens: 16000 } },
-    description: 'Produces concise release notes from merged PRs.',
     instructions: '# Who you are\n\nWrite concise release notes.',
     skills: [{ name: 'release-writing' }],
     mcpServers: [{ name: 'github' }],
diff --git a/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx b/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
index 3bf85eac3..298075e40 100644
--- a/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
@@ -35,9 +35,9 @@ function mockServer(
   agents: Array<{
     name: string;
     agentId: string;
+    description?: string;
     agentSpec?: {
       model: { name: string };
-      description?: string;
       skills?: Array<{ id: string; name: string }>;
       mcpServers?: Array<{ id: string; name: string }>;
     };
@@ -149,7 +149,8 @@ describe('AgentsLibrary', () => {
       {
         name: 'alpha-agent',
         agentId: 'alpha-agent',
-        agentSpec: { model: { name: 'openai/gpt-4.1' }, description: 'Alpha handles triage.' },
+        description: 'Alpha handles triage.',
+        agentSpec: { model: { name: 'openai/gpt-4.1' } },
       },
       { name: 'beta-agent', agentId: 'beta-agent' },
     ]);
@@ -245,6 +246,7 @@ describe('AgentsLibrary', () => {
         {
           name: 'writer',
           agentId: 'writer-id',
+          description: 'Writes release notes.',
           agentSpec: { model: { name: 'openai-main/gpt-4.1' } },
         },
       ]),
@@ -268,6 +270,7 @@ describe('AgentsLibrary', () => {
     await waitFor(() => {
       expect(saveAgent).toHaveBeenCalledWith({
         agentName: 'writer-copy',
+        description: 'Writes release notes.',
         agentSpec: { model: { name: 'openai-main/gpt-4.1' } },
         intent: 'create',
       });
diff --git a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
index 1cc5e13e4..77b62d8c9 100644
--- a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
+++ b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
@@ -102,7 +102,15 @@ function renderButton({
   };
 }
 
-function BoundMutableSaveButton({ agentId, agentName }: { agentId: string; agentName?: string }) {
+function BoundMutableSaveButton({
+  agentId,
+  agentName,
+  description,
+}: {
+  agentId: string;
+  agentName?: string;
+  description?: string;
+}) {
   const { selectLibraryAgent } = useShellMode();
   useEffect(() => {
     selectLibraryAgent({
@@ -110,9 +118,10 @@ function BoundMutableSaveButton({ agentId, agentName }: { agentId: string; agent
       isCreateAgent: true,
       agentId,
       agentName,
+      description,
       agentSpec,
     });
-  }, [agentId, agentName, selectLibraryAgent]);
+  }, [agentId, agentName, description, selectLibraryAgent]);
   return <SaveAgentButton />;
 }
 
@@ -371,10 +380,10 @@ describe('SaveAgentButton', () => {
     await waitFor(() => expect(saveAgent).toHaveBeenCalledOnce());
     expect(saveAgent).toHaveBeenCalledWith({
       agentName: 'my-agent',
+      description: 'My agent description.',
       agentSpec: {
         model: { name: 'openai/gpt-4.1', params: undefined },
         instructions: 'Be helpful.',
-        description: 'My agent description.',
         mcpServers: [{ id: 'github', name: 'GitHub' }],
         skills: [{ id: 'research', name: 'Research' }],
         config: undefined,
@@ -489,10 +498,9 @@ describe('SaveAgentButton', () => {
     agentSpec = {
       model: { name: 'openai/gpt-4.1' },
       instructions: 'Be helpful.',
-      description: 'Existing agent summary.',
     };
     renderButton({
-      children: <BoundMutableSaveButton agentId="writer" agentName="writer" />,
+      children: <BoundMutableSaveButton agentId="writer" agentName="writer" description="Existing agent summary." />,
     });
     fireEvent.click(await screen.findByRole('button', { name: 'Update Agent' }));
     const dialog = await screen.findByRole('dialog', { name: 'Update agent' });
diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts
index 021b91a64..3e8059b9b 100644
--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts
+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/agentSessionsServer.test.ts
@@ -38,10 +38,10 @@ describe('createHarnessAgentSessionsServer', () => {
     assert.deepEqual(await server.getAgent({ agentId: 'agent-1' }), {
       agentId: 'agent-1',
       name: 'writer',
+      description: 'Writes docs.',
       agentSpec: {
         model: { name: 'openai/gpt-5' },
         instructions: 'Write.',
-        description: 'Writes docs.',
       },
     });
     assert.deepEqual(await server.getCodeSnippets({ agentId: 'agent-1' }), [
diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
index 283bac412..d435201f5 100644
--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
@@ -336,9 +336,9 @@ describe('harnessBuilderServer', () => {
         subjectType: 'user',
         subjectDisplayName: 'Alice',
       },
+      description: 'Reviews pull requests.',
       agentSpec: {
         model: { name: 'test/model' },
-        description: 'Reviews pull requests.',
         instructions: 'Review carefully.',
         skills: [{ name: 'review', preload: false }],
         mcpServers: [{ name: 'github', enableTools: ['@all'] }],
@@ -413,9 +413,9 @@ describe('harnessBuilderServer', () => {
     const builder = createHarnessBuilderServer({ fetch: fetchMock });
     await builder.saveAgent({
       agentName: 'described-agent',
+      description: 'Helps with reviews.',
       agentSpec: {
         model: { name: 'test/model' },
-        description: 'Helps with reviews.',
         skills: [{ name: 'review' }],
       },
       intent: 'create',

From 87fc483358c1006cedb85641f10ae1097760d059 Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Fri, 11 Sep 2026 15:58:08 +0530
Subject: [PATCH 4/9] chore: update @truefoundry/assistant-ui-runtime to
 version 0.1.37 in package.json files

---
 packages/frontend/package.json     |   2 +-
 packages/trueforge-ui/package.json |   2 +-
 pnpm-lock.yaml                     | 291 ++---------------------------
 3 files changed, 13 insertions(+), 282 deletions(-)

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 7df484c6f..693fa3a78 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -26,7 +26,7 @@
     "@assistant-ui/core": "0.2.22",
     "@assistant-ui/react": "0.14.27",
     "@assistant-ui/store": "0.2.21",
-    "@truefoundry/assistant-ui-runtime": "0.1.36",
+    "@truefoundry/assistant-ui-runtime": "0.1.37",
     "@truefoundry/trueforge-sdk": "workspace:*",
     "@truefoundry/trueforge-ui": "workspace:*",
     "monaco-editor": "^0.52.0",
diff --git a/packages/trueforge-ui/package.json b/packages/trueforge-ui/package.json
index c2000135a..1607b781f 100644
--- a/packages/trueforge-ui/package.json
+++ b/packages/trueforge-ui/package.json
@@ -95,7 +95,7 @@
     "@openuidev/react-headless": "^0.9.4",
     "@openuidev/react-lang": "^0.2.9",
     "@openuidev/react-ui": "^0.13.2",
-    "@truefoundry/assistant-ui-runtime": "0.1.36",
+    "@truefoundry/assistant-ui-runtime": "0.1.37",
     "@truefoundry/trueforge-sdk": "workspace:*",
     "chart.js": "^4.5.1",
     "clsx": "^2.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d91ce6711..be90d6ee2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -69,8 +69,8 @@ importers:
         specifier: 0.2.21
         version: 0.2.21(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(react@19.2.8)
       '@truefoundry/assistant-ui-runtime':
-        specifier: 0.1.36
-        version: 0.1.36(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(assistant-cloud@0.1.41(redis@5.12.1(@opentelemetry/api@1.9.1)))(react@19.2.8)(redis@5.12.1(@opentelemetry/api@1.9.1))(truefoundry-gateway-sdk@0.4.2)(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)))
+        specifier: 0.1.37
+        version: 0.1.37(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(assistant-cloud@0.1.41(redis@5.12.1(@opentelemetry/api@1.9.1)))(react@19.2.8)(redis@5.12.1(@opentelemetry/api@1.9.1))(truefoundry-gateway-sdk@0.4.2)(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)))
       '@truefoundry/trueforge-sdk':
         specifier: workspace:*
         version: link:../trueforge-sdk
@@ -366,8 +366,8 @@ importers:
         specifier: ^0.13.2
         version: 0.13.3(@openuidev/react-headless@0.9.4(react@19.2.8)(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8))))(@openuidev/react-lang@0.2.9(@modelcontextprotocol/sdk@1.30.0(supports-color@8.1.1)(zod@4.4.3))(react@19.2.8)(zod@4.4.3))(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(supports-color@8.1.1)(zod@4.4.3)(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)))
       '@truefoundry/assistant-ui-runtime':
-        specifier: 0.1.36
-        version: 0.1.36(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(assistant-cloud@0.1.41(redis@5.12.1(@opentelemetry/api@1.9.1)))(react@19.2.8)(redis@5.12.1(@opentelemetry/api@1.9.1))(truefoundry-gateway-sdk@0.4.2)(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)))
+        specifier: 0.1.37
+        version: 0.1.37(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(assistant-cloud@0.1.41(redis@5.12.1(@opentelemetry/api@1.9.1)))(react@19.2.8)(redis@5.12.1(@opentelemetry/api@1.9.1))(truefoundry-gateway-sdk@0.4.2)(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)))
       '@truefoundry/trueforge-sdk':
         specifier: workspace:*
         version: link:../trueforge-sdk
@@ -1077,12 +1077,6 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.28.1':
-    resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-
   '@esbuild/aix-ppc64@0.28.2':
     resolution: {integrity: sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==}
     engines: {node: '>=18'}
@@ -1101,12 +1095,6 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.28.1':
-    resolution: {integrity: sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-
   '@esbuild/android-arm64@0.28.2':
     resolution: {integrity: sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==}
     engines: {node: '>=18'}
@@ -1125,12 +1113,6 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.28.1':
-    resolution: {integrity: sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-
   '@esbuild/android-arm@0.28.2':
     resolution: {integrity: sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==}
     engines: {node: '>=18'}
@@ -1149,12 +1131,6 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.28.1':
-    resolution: {integrity: sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-
   '@esbuild/android-x64@0.28.2':
     resolution: {integrity: sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==}
     engines: {node: '>=18'}
@@ -1173,12 +1149,6 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.28.1':
-    resolution: {integrity: sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-
   '@esbuild/darwin-arm64@0.28.2':
     resolution: {integrity: sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==}
     engines: {node: '>=18'}
@@ -1197,12 +1167,6 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.28.1':
-    resolution: {integrity: sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-
   '@esbuild/darwin-x64@0.28.2':
     resolution: {integrity: sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==}
     engines: {node: '>=18'}
@@ -1221,12 +1185,6 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.28.1':
-    resolution: {integrity: sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-
   '@esbuild/freebsd-arm64@0.28.2':
     resolution: {integrity: sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==}
     engines: {node: '>=18'}
@@ -1245,12 +1203,6 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.28.1':
-    resolution: {integrity: sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-
   '@esbuild/freebsd-x64@0.28.2':
     resolution: {integrity: sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==}
     engines: {node: '>=18'}
@@ -1269,12 +1221,6 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.28.1':
-    resolution: {integrity: sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-
   '@esbuild/linux-arm64@0.28.2':
     resolution: {integrity: sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==}
     engines: {node: '>=18'}
@@ -1293,12 +1239,6 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.28.1':
-    resolution: {integrity: sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-
   '@esbuild/linux-arm@0.28.2':
     resolution: {integrity: sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==}
     engines: {node: '>=18'}
@@ -1317,12 +1257,6 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.28.1':
-    resolution: {integrity: sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-
   '@esbuild/linux-ia32@0.28.2':
     resolution: {integrity: sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==}
     engines: {node: '>=18'}
@@ -1341,12 +1275,6 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.28.1':
-    resolution: {integrity: sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-
   '@esbuild/linux-loong64@0.28.2':
     resolution: {integrity: sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==}
     engines: {node: '>=18'}
@@ -1365,12 +1293,6 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.28.1':
-    resolution: {integrity: sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-
   '@esbuild/linux-mips64el@0.28.2':
     resolution: {integrity: sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==}
     engines: {node: '>=18'}
@@ -1389,12 +1311,6 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.28.1':
-    resolution: {integrity: sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-
   '@esbuild/linux-ppc64@0.28.2':
     resolution: {integrity: sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==}
     engines: {node: '>=18'}
@@ -1413,12 +1329,6 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.28.1':
-    resolution: {integrity: sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-
   '@esbuild/linux-riscv64@0.28.2':
     resolution: {integrity: sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==}
     engines: {node: '>=18'}
@@ -1437,12 +1347,6 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.28.1':
-    resolution: {integrity: sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-
   '@esbuild/linux-s390x@0.28.2':
     resolution: {integrity: sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==}
     engines: {node: '>=18'}
@@ -1461,12 +1365,6 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.28.1':
-    resolution: {integrity: sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-
   '@esbuild/linux-x64@0.28.2':
     resolution: {integrity: sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==}
     engines: {node: '>=18'}
@@ -1485,12 +1383,6 @@ packages:
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-arm64@0.28.1':
-    resolution: {integrity: sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [netbsd]
-
   '@esbuild/netbsd-arm64@0.28.2':
     resolution: {integrity: sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==}
     engines: {node: '>=18'}
@@ -1509,12 +1401,6 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.28.1':
-    resolution: {integrity: sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-
   '@esbuild/netbsd-x64@0.28.2':
     resolution: {integrity: sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==}
     engines: {node: '>=18'}
@@ -1533,12 +1419,6 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-arm64@0.28.1':
-    resolution: {integrity: sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-
   '@esbuild/openbsd-arm64@0.28.2':
     resolution: {integrity: sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==}
     engines: {node: '>=18'}
@@ -1557,12 +1437,6 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.28.1':
-    resolution: {integrity: sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-
   '@esbuild/openbsd-x64@0.28.2':
     resolution: {integrity: sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==}
     engines: {node: '>=18'}
@@ -1581,12 +1455,6 @@ packages:
     cpu: [arm64]
     os: [openharmony]
 
-  '@esbuild/openharmony-arm64@0.28.1':
-    resolution: {integrity: sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openharmony]
-
   '@esbuild/openharmony-arm64@0.28.2':
     resolution: {integrity: sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==}
     engines: {node: '>=18'}
@@ -1605,12 +1473,6 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.28.1':
-    resolution: {integrity: sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-
   '@esbuild/sunos-x64@0.28.2':
     resolution: {integrity: sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==}
     engines: {node: '>=18'}
@@ -1629,12 +1491,6 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.28.1':
-    resolution: {integrity: sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-
   '@esbuild/win32-arm64@0.28.2':
     resolution: {integrity: sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==}
     engines: {node: '>=18'}
@@ -1653,12 +1509,6 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.28.1':
-    resolution: {integrity: sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-
   '@esbuild/win32-ia32@0.28.2':
     resolution: {integrity: sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==}
     engines: {node: '>=18'}
@@ -1677,12 +1527,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.28.1':
-    resolution: {integrity: sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-
   '@esbuild/win32-x64@0.28.2':
     resolution: {integrity: sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==}
     engines: {node: '>=18'}
@@ -3648,8 +3492,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@truefoundry/assistant-ui-runtime@0.1.36':
-    resolution: {integrity: sha512-bjI3lRfvmTwy44hKHlf/RuJN8eLqIpm6ph9rjjBKXw/5D1fGWdGJCB/TDzeSDAHPGij63yJkFCvYXEbMdDx8Kg==}
+  '@truefoundry/assistant-ui-runtime@0.1.37':
+    resolution: {integrity: sha512-nFWitRLb6umJofzjjd/1+XhL7QzJ77tw+hTyriCEdb+9E7R8Z4qwM8ZMmmkC4b7P7P18LqgGh+kqYinaqsTRQg==}
     peerDependencies:
       '@types/react': '*'
       react: ^18 || ^19
@@ -4828,11 +4672,6 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  esbuild@0.28.1:
-    resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==}
-    engines: {node: '>=18'}
-    hasBin: true
-
   esbuild@0.28.2:
     resolution: {integrity: sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==}
     engines: {node: '>=18'}
@@ -8497,9 +8336,6 @@ snapshots:
   '@esbuild/aix-ppc64@0.27.7':
     optional: true
 
-  '@esbuild/aix-ppc64@0.28.1':
-    optional: true
-
   '@esbuild/aix-ppc64@0.28.2':
     optional: true
 
@@ -8509,9 +8345,6 @@ snapshots:
   '@esbuild/android-arm64@0.27.7':
     optional: true
 
-  '@esbuild/android-arm64@0.28.1':
-    optional: true
-
   '@esbuild/android-arm64@0.28.2':
     optional: true
 
@@ -8521,9 +8354,6 @@ snapshots:
   '@esbuild/android-arm@0.27.7':
     optional: true
 
-  '@esbuild/android-arm@0.28.1':
-    optional: true
-
   '@esbuild/android-arm@0.28.2':
     optional: true
 
@@ -8533,9 +8363,6 @@ snapshots:
   '@esbuild/android-x64@0.27.7':
     optional: true
 
-  '@esbuild/android-x64@0.28.1':
-    optional: true
-
   '@esbuild/android-x64@0.28.2':
     optional: true
 
@@ -8545,9 +8372,6 @@ snapshots:
   '@esbuild/darwin-arm64@0.27.7':
     optional: true
 
-  '@esbuild/darwin-arm64@0.28.1':
-    optional: true
-
   '@esbuild/darwin-arm64@0.28.2':
     optional: true
 
@@ -8557,9 +8381,6 @@ snapshots:
   '@esbuild/darwin-x64@0.27.7':
     optional: true
 
-  '@esbuild/darwin-x64@0.28.1':
-    optional: true
-
   '@esbuild/darwin-x64@0.28.2':
     optional: true
 
@@ -8569,9 +8390,6 @@ snapshots:
   '@esbuild/freebsd-arm64@0.27.7':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.28.1':
-    optional: true
-
   '@esbuild/freebsd-arm64@0.28.2':
     optional: true
 
@@ -8581,9 +8399,6 @@ snapshots:
   '@esbuild/freebsd-x64@0.27.7':
     optional: true
 
-  '@esbuild/freebsd-x64@0.28.1':
-    optional: true
-
   '@esbuild/freebsd-x64@0.28.2':
     optional: true
 
@@ -8593,9 +8408,6 @@ snapshots:
   '@esbuild/linux-arm64@0.27.7':
     optional: true
 
-  '@esbuild/linux-arm64@0.28.1':
-    optional: true
-
   '@esbuild/linux-arm64@0.28.2':
     optional: true
 
@@ -8605,9 +8417,6 @@ snapshots:
   '@esbuild/linux-arm@0.27.7':
     optional: true
 
-  '@esbuild/linux-arm@0.28.1':
-    optional: true
-
   '@esbuild/linux-arm@0.28.2':
     optional: true
 
@@ -8617,9 +8426,6 @@ snapshots:
   '@esbuild/linux-ia32@0.27.7':
     optional: true
 
-  '@esbuild/linux-ia32@0.28.1':
-    optional: true
-
   '@esbuild/linux-ia32@0.28.2':
     optional: true
 
@@ -8629,9 +8435,6 @@ snapshots:
   '@esbuild/linux-loong64@0.27.7':
     optional: true
 
-  '@esbuild/linux-loong64@0.28.1':
-    optional: true
-
   '@esbuild/linux-loong64@0.28.2':
     optional: true
 
@@ -8641,9 +8444,6 @@ snapshots:
   '@esbuild/linux-mips64el@0.27.7':
     optional: true
 
-  '@esbuild/linux-mips64el@0.28.1':
-    optional: true
-
   '@esbuild/linux-mips64el@0.28.2':
     optional: true
 
@@ -8653,9 +8453,6 @@ snapshots:
   '@esbuild/linux-ppc64@0.27.7':
     optional: true
 
-  '@esbuild/linux-ppc64@0.28.1':
-    optional: true
-
   '@esbuild/linux-ppc64@0.28.2':
     optional: true
 
@@ -8665,9 +8462,6 @@ snapshots:
   '@esbuild/linux-riscv64@0.27.7':
     optional: true
 
-  '@esbuild/linux-riscv64@0.28.1':
-    optional: true
-
   '@esbuild/linux-riscv64@0.28.2':
     optional: true
 
@@ -8677,9 +8471,6 @@ snapshots:
   '@esbuild/linux-s390x@0.27.7':
     optional: true
 
-  '@esbuild/linux-s390x@0.28.1':
-    optional: true
-
   '@esbuild/linux-s390x@0.28.2':
     optional: true
 
@@ -8689,9 +8480,6 @@ snapshots:
   '@esbuild/linux-x64@0.27.7':
     optional: true
 
-  '@esbuild/linux-x64@0.28.1':
-    optional: true
-
   '@esbuild/linux-x64@0.28.2':
     optional: true
 
@@ -8701,9 +8489,6 @@ snapshots:
   '@esbuild/netbsd-arm64@0.27.7':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.28.1':
-    optional: true
-
   '@esbuild/netbsd-arm64@0.28.2':
     optional: true
 
@@ -8713,9 +8498,6 @@ snapshots:
   '@esbuild/netbsd-x64@0.27.7':
     optional: true
 
-  '@esbuild/netbsd-x64@0.28.1':
-    optional: true
-
   '@esbuild/netbsd-x64@0.28.2':
     optional: true
 
@@ -8725,9 +8507,6 @@ snapshots:
   '@esbuild/openbsd-arm64@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.28.1':
-    optional: true
-
   '@esbuild/openbsd-arm64@0.28.2':
     optional: true
 
@@ -8737,9 +8516,6 @@ snapshots:
   '@esbuild/openbsd-x64@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-x64@0.28.1':
-    optional: true
-
   '@esbuild/openbsd-x64@0.28.2':
     optional: true
 
@@ -8749,9 +8525,6 @@ snapshots:
   '@esbuild/openharmony-arm64@0.27.7':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.28.1':
-    optional: true
-
   '@esbuild/openharmony-arm64@0.28.2':
     optional: true
 
@@ -8761,9 +8534,6 @@ snapshots:
   '@esbuild/sunos-x64@0.27.7':
     optional: true
 
-  '@esbuild/sunos-x64@0.28.1':
-    optional: true
-
   '@esbuild/sunos-x64@0.28.2':
     optional: true
 
@@ -8773,9 +8543,6 @@ snapshots:
   '@esbuild/win32-arm64@0.27.7':
     optional: true
 
-  '@esbuild/win32-arm64@0.28.1':
-    optional: true
-
   '@esbuild/win32-arm64@0.28.2':
     optional: true
 
@@ -8785,9 +8552,6 @@ snapshots:
   '@esbuild/win32-ia32@0.27.7':
     optional: true
 
-  '@esbuild/win32-ia32@0.28.1':
-    optional: true
-
   '@esbuild/win32-ia32@0.28.2':
     optional: true
 
@@ -8797,9 +8561,6 @@ snapshots:
   '@esbuild/win32-x64@0.27.7':
     optional: true
 
-  '@esbuild/win32-x64@0.28.1':
-    optional: true
-
   '@esbuild/win32-x64@0.28.2':
     optional: true
 
@@ -10908,7 +10669,7 @@ snapshots:
       '@types/react': 19.2.18
       '@types/react-dom': 19.2.5(@types/react@19.2.18)
 
-  '@truefoundry/assistant-ui-runtime@0.1.36(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(assistant-cloud@0.1.41(redis@5.12.1(@opentelemetry/api@1.9.1)))(react@19.2.8)(redis@5.12.1(@opentelemetry/api@1.9.1))(truefoundry-gateway-sdk@0.4.2)(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)))':
+  '@truefoundry/assistant-ui-runtime@0.1.37(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(assistant-cloud@0.1.41(redis@5.12.1(@opentelemetry/api@1.9.1)))(react@19.2.8)(redis@5.12.1(@opentelemetry/api@1.9.1))(truefoundry-gateway-sdk@0.4.2)(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)))':
     dependencies:
       '@assistant-ui/core': 0.2.22(@assistant-ui/store@0.2.21(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(react@19.2.8))(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(assistant-cloud@0.1.41(redis@5.12.1(@opentelemetry/api@1.9.1)))(react@19.2.8)(redis@5.12.1(@opentelemetry/api@1.9.1))(zustand@5.0.15(@types/react@19.2.18)(react@19.2.8)(use-sync-external-store@1.6.0(react@19.2.8)))
       '@assistant-ui/store': 0.2.21(@assistant-ui/tap@0.9.5(@types/react@19.2.18)(react@19.2.8))(@types/react@19.2.18)(react@19.2.8)
@@ -11098,10 +10859,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@8.68.0(@typescript-eslint/parser@8.68.0(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.68.0(@typescript-eslint/parser@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.68.0(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)
       '@typescript-eslint/scope-manager': 8.68.0
       '@typescript-eslint/type-utils': 8.68.0(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)
       '@typescript-eslint/utils': 8.68.0(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)
@@ -12169,35 +11930,6 @@ snapshots:
       '@esbuild/win32-ia32': 0.27.7
       '@esbuild/win32-x64': 0.27.7
 
-  esbuild@0.28.1:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.28.1
-      '@esbuild/android-arm': 0.28.1
-      '@esbuild/android-arm64': 0.28.1
-      '@esbuild/android-x64': 0.28.1
-      '@esbuild/darwin-arm64': 0.28.1
-      '@esbuild/darwin-x64': 0.28.1
-      '@esbuild/freebsd-arm64': 0.28.1
-      '@esbuild/freebsd-x64': 0.28.1
-      '@esbuild/linux-arm': 0.28.1
-      '@esbuild/linux-arm64': 0.28.1
-      '@esbuild/linux-ia32': 0.28.1
-      '@esbuild/linux-loong64': 0.28.1
-      '@esbuild/linux-mips64el': 0.28.1
-      '@esbuild/linux-ppc64': 0.28.1
-      '@esbuild/linux-riscv64': 0.28.1
-      '@esbuild/linux-s390x': 0.28.1
-      '@esbuild/linux-x64': 0.28.1
-      '@esbuild/netbsd-arm64': 0.28.1
-      '@esbuild/netbsd-x64': 0.28.1
-      '@esbuild/openbsd-arm64': 0.28.1
-      '@esbuild/openbsd-x64': 0.28.1
-      '@esbuild/openharmony-arm64': 0.28.1
-      '@esbuild/sunos-x64': 0.28.1
-      '@esbuild/win32-arm64': 0.28.1
-      '@esbuild/win32-ia32': 0.28.1
-      '@esbuild/win32-x64': 0.28.1
-
   esbuild@0.28.2:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.28.2
@@ -12226,7 +11958,6 @@ snapshots:
       '@esbuild/win32-arm64': 0.28.2
       '@esbuild/win32-ia32': 0.28.2
       '@esbuild/win32-x64': 0.28.2
-    optional: true
 
   escalade@3.2.0: {}
 
@@ -15304,7 +15035,7 @@ snapshots:
 
   tsx@4.23.12:
     dependencies:
-      esbuild: 0.28.1
+      esbuild: 0.28.2
     optionalDependencies:
       fsevents: 2.3.3
 
@@ -15339,7 +15070,7 @@ snapshots:
 
   typescript-eslint@8.68.0(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.68.0(@typescript-eslint/parser@8.68.0(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.68.0(@typescript-eslint/parser@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)
       '@typescript-eslint/parser': 8.68.0(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)
       '@typescript-eslint/typescript-estree': 8.68.0(supports-color@8.1.1)(typescript@5.9.3)
       '@typescript-eslint/utils': 8.68.0(eslint@9.39.5(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@5.9.3)

From d94926e97d9cd26c74ed81f03242ccb90996f92e Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Fri, 11 Sep 2026 16:08:06 +0530
Subject: [PATCH 5/9] Refactor: Simplify agent description handling and improve
 UI consistency

---
 packages/trueforge-ui/src/atoms/AgentsLibrary.tsx | 13 +++----------
 .../trueforge-ui/src/atoms/SaveAgentButton.tsx    |  3 +--
 packages/trueforge-ui/src/atoms/SaveAgentForm.tsx |  5 +----
 .../test/atoms/SaveAgentButton.test.tsx           | 15 ++++++++++++++-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
index 0e526f362..c81a14a99 100644
--- a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
+++ b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
@@ -194,17 +194,11 @@ export function AgentLibraryRow({
             <span className="block truncate">{agent.name}</span>
           </button>
         )}
-      </TableCell>
-      <TableCell>
         {description ? (
-          <span className="block truncate text-xs" title={description}>
+          <span className="text-text-secondary block truncate text-xs font-normal" title={description}>
             {description}
           </span>
-        ) : (
-          <span className="text-sm" aria-label={`No description for ${agent.name}`}>
-            —
-          </span>
-        )}
+        ) : null}
       </TableCell>
       <TableCell>
         {hasConfiguration ? (
@@ -491,8 +485,7 @@ export function AgentsLibrary({ onSelectAgent }: AgentsLibraryProps) {
                 <Table className="table-fixed">
                   <TableHeader>
                     <TableRow className="hover:bg-transparent">
-                      <TableHead className="w-64">Agent name</TableHead>
-                      <TableHead>Description</TableHead>
+                      <TableHead className="min-w-64">Agent name</TableHead>
                       <TableHead className="w-64">Configuration</TableHead>
                       {showCreatedByColumn ? <TableHead className="w-56">Created by</TableHead> : null}
                       {showSchedulesColumn ? <TableHead className="w-64">Schedules</TableHead> : null}
diff --git a/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx b/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
index 4fc713640..c764dfb3e 100644
--- a/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
+++ b/packages/trueforge-ui/src/atoms/SaveAgentButton.tsx
@@ -124,7 +124,7 @@ function SaveAgentButtonContent({
     const normalizedName = name.trim();
     if (!normalizedName || !draftSpec.model.name.trim()) return;
     const normalizedDescription = description.trim();
-    if (intent === 'create' && !normalizedDescription) return;
+    if (!normalizedDescription) return;
     setSaving(true);
     setError(null);
     try {
@@ -194,7 +194,6 @@ function SaveAgentButtonContent({
             error={error}
             onNameChange={setName}
             onDescriptionChange={setDescription}
-            onChange={setDraftSpec}
             onCancel={close}
             onSave={() => void save()}
           />
diff --git a/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx b/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
index 03d810a50..780aecebc 100644
--- a/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
+++ b/packages/trueforge-ui/src/atoms/SaveAgentForm.tsx
@@ -15,7 +15,6 @@ export type SaveAgentFormProps = {
   error: string | null;
   onNameChange: (name: string) => void;
   onDescriptionChange: (description: string) => void;
-  onChange: (spec: AgentSpec) => void;
   onCancel: () => void;
   onSave: () => void;
 };
@@ -29,7 +28,6 @@ export function SaveAgentForm({
   error,
   onNameChange,
   onDescriptionChange,
-  onChange,
   onCancel,
   onSave,
 }: SaveAgentFormProps) {
@@ -41,8 +39,7 @@ export function SaveAgentForm({
     errorRef.current?.scrollIntoView?.({ block: 'nearest', behavior: 'smooth' });
   }, [error]);
 
-  const canSave =
-    name.trim() !== '' && spec.model.name.trim() !== '' && (intent === 'update' || description.trim() !== '');
+  const canSave = name.trim() !== '' && spec.model.name.trim() !== '' && description.trim() !== '';
 
   return (
     <div className="flex min-h-0 w-full flex-1 flex-col">
diff --git a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
index 77b62d8c9..6b64f4112 100644
--- a/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
+++ b/packages/trueforge-ui/test/atoms/SaveAgentButton.test.tsx
@@ -338,7 +338,7 @@ describe('SaveAgentButton', () => {
     const saveAgent = vi.fn(async (): Promise<SaveAgentResult> => ({ agentId: 'writer' }));
     renderButton({
       saveAgent,
-      children: <BoundMutableSaveButton agentId="writer" />,
+      children: <BoundMutableSaveButton agentId="writer" description="Writes docs." />,
     });
 
     const trigger = await screen.findByRole('button', { name: 'Update Agent' });
@@ -494,6 +494,19 @@ describe('SaveAgentButton', () => {
     expect(within(dialog).getByRole('button', { name: 'Save changes' })).toBeEnabled();
   });
 
+  it('disables Save on update when description is empty', async () => {
+    renderButton({
+      children: <BoundMutableSaveButton agentId="writer" agentName="writer" description="Existing agent summary." />,
+    });
+    fireEvent.click(await screen.findByRole('button', { name: 'Update Agent' }));
+    const dialog = await screen.findByRole('dialog', { name: 'Update agent' });
+    expect(within(dialog).getByRole('button', { name: 'Save changes' })).toBeEnabled();
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: '   ' } });
+    expect(within(dialog).getByRole('button', { name: 'Save changes' })).toBeDisabled();
+    fireEvent.change(within(dialog).getByLabelText('Description'), { target: { value: 'Updated summary.' } });
+    expect(within(dialog).getByRole('button', { name: 'Save changes' })).toBeEnabled();
+  });
+
   it('prefills description on update intent', async () => {
     agentSpec = {
       model: { name: 'openai/gpt-4.1' },

From 2f681eb048d08b0f22e3e43427b812eecbac0fe2 Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Fri, 11 Sep 2026 16:14:22 +0530
Subject: [PATCH 6/9] Fix: Ensure agent description is displayed in the save
 dialog

---
 packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx b/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx
index fab276647..be1af8c7f 100644
--- a/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx
+++ b/packages/trueforge-ui/test/containers/TrueForgeUI.test.tsx
@@ -300,7 +300,7 @@ describe('TrueForgeUI', () => {
     fireEvent.click(await screen.findByRole('button', { name: 'Save Agent' }));
     const saveDialog = await screen.findByRole('dialog', { name: 'Save agent' });
     expect(within(saveDialog).getByLabelText('Agent name')).toBeInTheDocument();
-    expect(within(saveDialog).queryByLabelText('Description')).not.toBeInTheDocument();
+    expect(within(saveDialog).getByLabelText('Description')).toBeInTheDocument();
     expect(within(saveDialog).queryByRole('button', { name: 'Edit Model' })).not.toBeInTheDocument();
     expect(within(saveDialog).queryByRole('button', { name: 'Edit Connectors' })).not.toBeInTheDocument();
     expect(getModels).toHaveBeenCalled();

From efe6190c755241b4668c72a38770ff39c9f0290c Mon Sep 17 00:00:00 2001
From: Govinda Vashishtha <57435703+govindavashishtha@users.noreply.github.com>
Date: Fri, 11 Sep 2026 16:35:33 +0530
Subject: [PATCH 7/9] Refactor: Replace description text with tooltip in
 AgentLibraryRow and remove unused description in AgentOverview

---
 packages/trueforge-ui/src/atoms/AgentsLibrary.tsx      | 10 +++++++---
 .../src/atoms/agent-details/AgentOverview.tsx          |  8 --------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
index c81a14a99..2bf923dd9 100644
--- a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
+++ b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
@@ -195,9 +195,13 @@ export function AgentLibraryRow({
           </button>
         )}
         {description ? (
-          <span className="text-text-secondary block truncate text-xs font-normal" title={description}>
-            {description}
-          </span>
+          <Tooltip
+            content={description}
+            className="max-w-sm whitespace-normal text-left"
+            triggerClassName="block max-w-full"
+          >
+            <span className="text-text-secondary block truncate text-xs font-normal">{description}</span>
+          </Tooltip>
         ) : null}
       </TableCell>
       <TableCell>
diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
index c226faf25..c7b197be2 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
@@ -52,7 +52,6 @@ export default function AgentOverview({ detail }: AgentOverviewProps) {
   const config = isRecord(spec.config) ? spec.config : null;
   const sandbox = isRecord(config?.sandbox) ? config.sandbox : null;
   const instructions = spec.instructions?.trim() ? spec.instructions : null;
-  const description = detail.description?.trim() ? detail.description : null;
   const execution = [
     ['Sandbox', typeof sandbox?.enabled === 'boolean' ? (sandbox.enabled ? 'Enabled' : 'Disabled') : undefined],
     ['Iteration limit', readRecordValue(config, 'iterationLimit', 'iteration_limit')],
@@ -69,13 +68,6 @@ export default function AgentOverview({ detail }: AgentOverviewProps) {
 
   return (
     <div className="flex min-h-0 flex-1 flex-col gap-3 overflow-auto p-4 md:overflow-hidden">
-      {description ? (
-        <div className="shrink-0">
-          <AgentOverviewCard title="Description">
-            <p className="text-sm text-text-secondary">{description}</p>
-          </AgentOverviewCard>
-        </div>
-      ) : null}
       <div className="grid min-h-0 flex-1 gap-3 md:grid-cols-[minmax(0,1fr)_18rem] md:overflow-hidden">
         <section className="flex min-h-64 flex-col rounded-lg border border-border bg-card-bg p-4 text-text-primary">
           <div className="mb-3 flex shrink-0 items-center justify-between gap-2">

From 2ed2087024ec10566e86472f48aaf57aac601126 Mon Sep 17 00:00:00 2001
From: Govinda Vashishtha <57435703+govindavashishtha@users.noreply.github.com>
Date: Fri, 11 Sep 2026 16:41:24 +0530
Subject: [PATCH 8/9] Enhancement: Add description display in AgentOverview
 component

---
 .../trueforge-ui/src/atoms/agent-details/AgentOverview.tsx  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
index c7b197be2..d4c2d249a 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentOverview.tsx
@@ -52,6 +52,7 @@ export default function AgentOverview({ detail }: AgentOverviewProps) {
   const config = isRecord(spec.config) ? spec.config : null;
   const sandbox = isRecord(config?.sandbox) ? config.sandbox : null;
   const instructions = spec.instructions?.trim() ? spec.instructions : null;
+  const description = detail.description?.trim() ? detail.description : null;
   const execution = [
     ['Sandbox', typeof sandbox?.enabled === 'boolean' ? (sandbox.enabled ? 'Enabled' : 'Disabled') : undefined],
     ['Iteration limit', readRecordValue(config, 'iterationLimit', 'iteration_limit')],
@@ -123,6 +124,11 @@ export default function AgentOverview({ detail }: AgentOverviewProps) {
         </section>
 
         <aside className="flex min-h-0 min-w-0 flex-col gap-3 md:overflow-auto">
+          {description ? (
+            <AgentOverviewCard title="Description" icon="file">
+              <p className="text-xs text-text-secondary">{description}</p>
+            </AgentOverviewCard>
+          ) : null}
           <AgentOverviewCard title="Model Configuration" icon="cpu">
             <dl className="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 gap-y-1 text-xs">
               <dt className="text-text-secondary">Model</dt>

From a5cedfd500a90cb5c94c36ef03ac5c1e6ba5468c Mon Sep 17 00:00:00 2001
From: Govinda Vashishtha <57435703+govindavashishtha@users.noreply.github.com>
Date: Fri, 11 Sep 2026 17:19:24 +0530
Subject: [PATCH 9/9] Add description field to agent records in tests and
 update AgentsLibrary for better handling of agent descriptions

- Added 'description' field to agent records in agentStoreContractSuite, TrueFoundryMcpServerStore.test, and TrueFoundryModelProviderStore.test.
- Updated AgentsLibrary component to improve description handling, ensuring proper truncation and avoiding name-echo descriptions.
- Enhanced test cases to verify description truncation and visibility in the AgentsLibrary.
---
 .../trueforge-ui/src/atoms/AgentsLibrary.tsx  | 15 ++++++----
 .../test/atoms/AgentsLibrary.test.tsx         | 28 +++++++++++++++++++
 .../tests/db/agentStoreContractSuite.ts       |  6 ++++
 .../TrueFoundryMcpServerStore.test.ts         |  1 +
 .../TrueFoundryModelProviderStore.test.ts     |  1 +
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
index e314e70ab..436e07639 100644
--- a/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
+++ b/packages/trueforge-ui/src/atoms/AgentsLibrary.tsx
@@ -189,11 +189,14 @@ export function AgentLibraryRow({
   const skillsTitle = skillNames.length ? skillNames.join(', ') : `${skillsCount} skills`;
   const hasConfiguration = modelLabel != null || skillsCount > 0 || mcpCount > 0;
   const hasNoSchedules = scheduleSummary != null && scheduleSummary.count === 0;
-  const description = agent.description?.trim() ? agent.description : null;
+  const storedDescription = agent.description?.trim() || null;
+  // Create falls back to name when description is missing; don't echo it under the title.
+  const description = storedDescription != null && storedDescription !== agent.name ? storedDescription : null;
 
   return (
     <TableRow className={hasNoSchedules ? 'group' : undefined}>
-      <TableCell className="text-text-primary font-medium">
+      {/* Fixed width so truncate works; 24rem = 1.5× the prior min-w-64 name column. */}
+      <TableCell className="text-text-primary w-96 max-w-96 font-medium">
         {onOpen == null ? (
           <span className="block truncate">{agent.name}</span>
         ) : (
@@ -210,7 +213,7 @@ export function AgentLibraryRow({
           <Tooltip
             content={description}
             className="max-w-sm whitespace-normal text-left"
-            triggerClassName="block max-w-full"
+            triggerClassName="block min-w-0 w-full max-w-full"
           >
             <span className="text-text-secondary block truncate text-xs font-normal">{description}</span>
           </Tooltip>
@@ -276,7 +279,7 @@ export function AgentLibraryRow({
           )}
         </TableCell>
       ) : null}
-      <TableCell>
+      <TableCell className="w-px">
         <div className="flex items-center justify-end gap-1.5">
           <PermissionGuard allowed={canUseAgent}>
             <Button.Secondary type="button" aria-label={`Try agent ${agent.name}`} size="large" onClick={onTry}>
@@ -286,7 +289,7 @@ export function AgentLibraryRow({
           </PermissionGuard>
           <AgentOverflowMenu
             agentName={agent.name}
-            {...(description != null ? { description } : {})}
+            {...(storedDescription != null ? { description: storedDescription } : {})}
             {...(spec != null ? { agentSpec: spec } : {})}
             canMutate={canMutate}
             canUse={canUseAgent}
@@ -531,7 +534,7 @@ export function AgentsLibrary({ onSelectAgent }: AgentsLibraryProps) {
               <Table>
                 <TableHeader>
                   <TableRow className="hover:bg-transparent">
-                    <TableHead>Agent name</TableHead>
+                    <TableHead className="w-96 min-w-96">Agent name</TableHead>
                     <TableHead>Configuration</TableHead>
                     {showCreatedByColumn ? <TableHead>Created by</TableHead> : null}
                     {showSchedulesColumn ? <TableHead className="w-[14rem]">Schedules</TableHead> : null}
diff --git a/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx b/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
index 6367ab79f..75a86ec9c 100644
--- a/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
+++ b/packages/trueforge-ui/test/atoms/AgentsLibrary.test.tsx
@@ -172,6 +172,34 @@ describe('AgentsLibrary', () => {
     });
   });
 
+  it('truncates long descriptions without hiding Try, and skips name-echo descriptions', async () => {
+    const longDescription = `${'Lorem ipsum dolor sit amet, '.repeat(20)}consectetur.`;
+    const server = mockServer([
+      {
+        name: 'verbose-agent',
+        agentId: 'verbose-agent',
+        description: longDescription,
+        agentSpec: { model: { name: 'openai/gpt-4.1' } },
+      },
+      {
+        name: 'echo-agent',
+        agentId: 'echo-agent',
+        description: 'echo-agent',
+        agentSpec: { model: { name: 'openai/gpt-4.1' } },
+      },
+    ]);
+
+    renderLibrary(<LibraryHarness />, { server });
+    fireEvent.click(screen.getByRole('button', { name: 'Open library' }));
+
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'Try agent verbose-agent' })).toBeInTheDocument();
+    });
+    expect(screen.getByRole('columnheader', { name: 'Configuration' })).toBeInTheDocument();
+    expect(screen.getByText(longDescription)).toHaveClass('truncate');
+    expect(screen.queryByText('echo-agent', { selector: '.text-xs' })).not.toBeInTheDocument();
+  });
+
   it('shows Edit/Clone/Delete when composer is enabled and agentSpec is present', async () => {
     const server = mockServer([
       {
diff --git a/packages/trueforge/tests/db/agentStoreContractSuite.ts b/packages/trueforge/tests/db/agentStoreContractSuite.ts
index a646d38b9..7393fdc1e 100644
--- a/packages/trueforge/tests/db/agentStoreContractSuite.ts
+++ b/packages/trueforge/tests/db/agentStoreContractSuite.ts
@@ -239,6 +239,7 @@ export function runAgentStoreContractSuite(getStore: () => IAgentStore): void {
       tenant_id: TENANT,
       created_by_subject: CREATED_BY_SUBJECT,
       name: 'alpha-bot',
+      description: 'Test agent.',
       manifest: manifest(),
       external_id: null,
     });
@@ -246,6 +247,7 @@ export function runAgentStoreContractSuite(getStore: () => IAgentStore): void {
       tenant_id: TENANT,
       created_by_subject: CREATED_BY_SUBJECT,
       name: 'bravo-bot',
+      description: 'Test agent.',
       manifest: manifest(),
       external_id: null,
     });
@@ -253,6 +255,7 @@ export function runAgentStoreContractSuite(getStore: () => IAgentStore): void {
       tenant_id: TENANT,
       created_by_subject: CREATED_BY_SUBJECT,
       name: 'unrelated',
+      description: 'Test agent.',
       manifest: manifest(),
       external_id: null,
     });
@@ -280,6 +283,7 @@ export function runAgentStoreContractSuite(getStore: () => IAgentStore): void {
       tenant_id: TENANT,
       created_by_subject: CREATED_BY_SUBJECT,
       name: 'charlie',
+      description: 'Test agent.',
       manifest: manifest(),
       external_id: null,
     });
@@ -287,6 +291,7 @@ export function runAgentStoreContractSuite(getStore: () => IAgentStore): void {
       tenant_id: TENANT,
       created_by_subject: CREATED_BY_SUBJECT,
       name: 'alpha',
+      description: 'Test agent.',
       manifest: manifest(),
       external_id: null,
     });
@@ -294,6 +299,7 @@ export function runAgentStoreContractSuite(getStore: () => IAgentStore): void {
       tenant_id: TENANT,
       created_by_subject: CREATED_BY_SUBJECT,
       name: 'bravo',
+      description: 'Test agent.',
       manifest: manifest(),
       external_id: null,
     });
diff --git a/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts b/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
index 95c7c9586..2913b3870 100644
--- a/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
+++ b/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
@@ -20,6 +20,7 @@ const AGENT: AgentRecord = {
   id: 'agent-1',
   tenant_id: TENANT,
   name: 'named',
+  description: 'Test agent.',
   manifest: AgentSpecSchema.parse({ model: { name: 'p/m' } }),
   external_id: 'ext-agent',
   created_by_subject: { subject_id: 'user-1', subject_type: 'user', subject_display_name: 'User' },
diff --git a/packages/trueforge/tests/unit/truefoundry/TrueFoundryModelProviderStore.test.ts b/packages/trueforge/tests/unit/truefoundry/TrueFoundryModelProviderStore.test.ts
index 652c42056..454c77ff0 100644
--- a/packages/trueforge/tests/unit/truefoundry/TrueFoundryModelProviderStore.test.ts
+++ b/packages/trueforge/tests/unit/truefoundry/TrueFoundryModelProviderStore.test.ts
@@ -13,6 +13,7 @@ const AGENT: AgentRecord = {
   id: 'agent-1',
   tenant_id: TENANT,
   name: 'named',
+  description: 'Test agent.',
   manifest: AgentSpecSchema.parse({ model: { name: 'p/m' } }),
   external_id: 'ext-agent',
   created_by_subject: { subject_id: 'user-1', subject_type: 'user', subject_display_name: 'User' },