Skip to content

Commit 49360bc

Browse files
Drop unused agent.metadata column (#561)
1 parent d269b01 commit 49360bc

12 files changed

Lines changed: 146 additions & 84 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@truefoundry/trueforge": patch
3+
---
4+
5+
Drop unused `agent.metadata`; remote identity is stored in `external_id`.

‎packages/trueforge/src/db/agentStore.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
* Implementations: PostgresAgentStore and SqliteAgentStore.
66
*/
77
import { AgentSpecSchema, type AgentSpec } from '@truefoundry/trueforge-core/agent-session';
8-
import type { AgentMetadata } from '../schemas/agentMetadata';
98
import type { ResourceName } from '../schemas/common';
109

1110
export interface AgentRecord {
1211
id: string;
1312
tenant_id: string;
1413
name: ResourceName;
1514
manifest: AgentSpec;
16-
metadata: AgentMetadata;
1715
external_id: string | null;
1816
/** ISO-8601 UTC instant. */
1917
created_at: string;
@@ -40,14 +38,13 @@ export interface CreateAgentInput {
4038
}
4139

4240
/**
43-
* Patch an existing agent by immutable id. At least one of `manifest`, `metadata`, or `external_id` is required.
41+
* Patch an existing agent by immutable id. At least one of `manifest` or `external_id` is required.
4442
* Provided fields replace the stored column; omitted fields are left unchanged.
4543
*/
4644
export interface UpdateAgentInput {
4745
tenant_id: string;
4846
id: string;
4947
manifest?: AgentSpec;
50-
metadata?: AgentMetadata;
5148
external_id?: string | null;
5249
}
5350

@@ -87,7 +84,7 @@ export interface IAgentStore<TTransaction = never> {
8784
getAgent(input: GetAgentInput, transaction?: TTransaction): Promise<AgentRecord | undefined>;
8885
/** Inserts a new agent with a generated ULID. Throws AgentNameConflictError or AgentExternalIdConflictError on unique clash. */
8986
createAgent(input: CreateAgentInput, transaction?: TTransaction): Promise<AgentRecord>;
90-
/** Patches `manifest`, `metadata`, and/or `external_id`. Throws AgentExternalIdConflictError on unique clash. Returns undefined if missing. */
87+
/** Patches `manifest` and/or `external_id`. Throws AgentExternalIdConflictError on unique clash. Returns undefined if missing. */
9188
updateAgent(input: UpdateAgentInput, transaction?: TTransaction): Promise<AgentRecord | undefined>;
9289
/** Deletes by immutable id. Idempotent if already missing. */
9390
deleteAgent(input: DeleteAgentInput, transaction?: TTransaction): Promise<void>;

‎packages/trueforge/src/db/postgres/agent-store/PostgresAgentStore.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { Kysely, Selectable, Transaction } from 'kysely';
2-
import { EMPTY_AGENT_METADATA } from '../../../schemas/agentMetadata';
32
import { newId } from '../../../utils/id';
43
import {
54
AgentExternalIdConflictError,
@@ -23,7 +22,6 @@ function toRecord(row: Selectable<AgentTable>): AgentRecord {
2322
tenant_id: row.tenant_id,
2423
name: row.name,
2524
manifest: parseStoredAgentSpec(row.manifest),
26-
metadata: row.metadata,
2725
external_id: row.external_id,
2826
created_at: row.created_at.toISOString(),
2927
updated_at: row.updated_at.toISOString(),
@@ -83,7 +81,6 @@ export class PostgresAgentStore implements IAgentStore<Transaction<Database>> {
8381
tenant_id: input.tenant_id,
8482
name: input.name,
8583
manifest: json(input.manifest),
86-
metadata: json(EMPTY_AGENT_METADATA),
8784
external_id: input.external_id,
8885
created_at: now(),
8986
updated_at: now(),
@@ -105,16 +102,15 @@ export class PostgresAgentStore implements IAgentStore<Transaction<Database>> {
105102
}
106103

107104
async updateAgent(input: UpdateAgentInput, transaction?: Transaction<Database>): Promise<AgentRecord | undefined> {
108-
if (input.manifest === undefined && input.metadata === undefined && input.external_id === undefined) {
109-
throw new Error('updateAgent requires manifest, metadata, and/or external_id');
105+
if (input.manifest === undefined && input.external_id === undefined) {
106+
throw new Error('updateAgent requires manifest and/or external_id');
110107
}
111108
const db = transaction ?? this.#db;
112109
try {
113110
const row = await db
114111
.updateTable('agent')
115112
.set({
116113
...(input.manifest === undefined ? {} : { manifest: json(input.manifest) }),
117-
...(input.metadata === undefined ? {} : { metadata: json(input.metadata) }),
118114
...(input.external_id === undefined ? {} : { external_id: input.external_id }),
119115
updated_at: now(),
120116
})
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { sql, type Kysely } from 'kysely';
2+
3+
/**
4+
* Drop agent.metadata — identity lives in external_id; column was never on the public Agent API.
5+
*/
6+
export async function up(db: Kysely<unknown>): Promise<void> {
7+
await sql`SET LOCAL lock_timeout = '5s'`.execute(db);
8+
await sql`ALTER TABLE agent DROP COLUMN IF EXISTS metadata`.execute(db);
9+
}
10+
11+
export async function down(db: Kysely<unknown>): Promise<void> {
12+
await sql`SET LOCAL lock_timeout = '5s'`.execute(db);
13+
await sql`
14+
ALTER TABLE agent
15+
ADD COLUMN metadata jsonb NOT NULL DEFAULT '{}'::jsonb
16+
`.execute(db);
17+
}

‎packages/trueforge/src/db/postgres/types.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import type {
2121
} from '@truefoundry/trueforge-core/core';
2222
import type { CurrentContextUsage } from '@truefoundry/trueforge-core/core/runtime/contextUsage';
2323
import type { ColumnType, Generated, JSONColumnType } from 'kysely';
24-
import type { AgentMetadata } from '../../schemas/agentMetadata';
2524
import type { McpServerManifest } from '../../schemas/mcpServer';
2625
import type { ModelProviderManifest } from '../../schemas/modelProvider';
2726
import type { SandboxBuildMetadata, SandboxBuildStatus, SandboxProviderManifest } from '../../schemas/sandboxProvider';
@@ -376,8 +375,6 @@ export interface AgentTable {
376375
name: string;
377376
/** AgentSpec document; replaced whole on every upsert */
378377
manifest: JSONColumnType<AgentSpec, AgentSpec, AgentSpec>;
379-
/** `agent.metadata` jsonb; default `{}` for existing rows */
380-
metadata: JSONColumnType<AgentMetadata, AgentMetadata, AgentMetadata>;
381378
external_id: string | null;
382379
created_at: Date;
383380
updated_at: Date;

‎packages/trueforge/src/db/sqlite/agent-store/SqliteAgentStore.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { AgentSpec } from '@truefoundry/trueforge-core/agent-session';
22
import type { ExpressionBuilder, Kysely, Transaction } from 'kysely';
3-
import { EMPTY_AGENT_METADATA, type AgentMetadata } from '../../../schemas/agentMetadata';
43
import { newId } from '../../../utils/id';
54
import {
65
AgentExternalIdConflictError,
@@ -24,7 +23,6 @@ function recordColumns(eb: ExpressionBuilder<Database, 'agent'>) {
2423
'tenant_id' as const,
2524
'name' as const,
2625
jsonText<AgentSpec>(eb.ref('manifest')).as('manifest'),
27-
jsonText<AgentMetadata>(eb.ref('metadata')).as('metadata'),
2826
'external_id' as const,
2927
'created_at' as const,
3028
'updated_at' as const,
@@ -36,7 +34,6 @@ function toRecord(row: {
3634
tenant_id: string;
3735
name: AgentRecord['name'];
3836
manifest: AgentSpec;
39-
metadata: AgentMetadata;
4037
external_id: string | null;
4138
created_at: string;
4239
updated_at: string;
@@ -85,7 +82,6 @@ export class SqliteAgentStore implements IAgentStore<Transaction<Database>> {
8582
tenant_id: input.tenant_id,
8683
name: input.name,
8784
manifest: jsonbBind(input.manifest),
88-
metadata: jsonbBind(EMPTY_AGENT_METADATA),
8985
external_id: input.external_id,
9086
created_at: timestamp,
9187
updated_at: timestamp,
@@ -108,16 +104,15 @@ export class SqliteAgentStore implements IAgentStore<Transaction<Database>> {
108104
}
109105

110106
async updateAgent(input: UpdateAgentInput, transaction?: Transaction<Database>): Promise<AgentRecord | undefined> {
111-
if (input.manifest === undefined && input.metadata === undefined && input.external_id === undefined) {
112-
throw new Error('updateAgent requires manifest, metadata, and/or external_id');
107+
if (input.manifest === undefined && input.external_id === undefined) {
108+
throw new Error('updateAgent requires manifest and/or external_id');
113109
}
114110
const db = transaction ?? this.#db;
115111
try {
116112
const row = await db
117113
.updateTable('agent')
118114
.set({
119115
...(input.manifest === undefined ? {} : { manifest: jsonbBind(input.manifest) }),
120-
...(input.metadata === undefined ? {} : { metadata: jsonbBind(input.metadata) }),
121116
...(input.external_id === undefined ? {} : { external_id: input.external_id }),
122117
updated_at: nowIso(),
123118
})
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
import { type Kysely, sql } from 'kysely';
2+
import { AGENT_EXTERNAL_ID_UQ } from '../../indexes';
3+
4+
/**
5+
* Drop agent.metadata. Rebuild: ADD/DROP COLUMN cannot take DEFAULT (jsonb(...)) / STRICT drop.
6+
* Keeps external_id + partial unique index from 20260902_000002.
7+
* DROP TABLE agent needs FKs off (`schedule` REFERENCES it).
8+
* PRAGMA foreign_keys is a no-op inside a txn.
9+
*/
10+
export async function up(db: Kysely<unknown>): Promise<void> {
11+
await sql`PRAGMA foreign_keys = OFF`.execute(db);
12+
try {
13+
await db.transaction().execute(async trx => {
14+
await sql`
15+
CREATE TABLE agent_new (
16+
id TEXT NOT NULL,
17+
tenant_id TEXT NOT NULL,
18+
name TEXT NOT NULL,
19+
manifest BLOB NOT NULL,
20+
external_id TEXT,
21+
created_at TEXT NOT NULL,
22+
updated_at TEXT NOT NULL,
23+
PRIMARY KEY (id),
24+
UNIQUE (tenant_id, name)
25+
) STRICT
26+
`.execute(trx);
27+
28+
await sql`
29+
INSERT INTO agent_new (
30+
id,
31+
tenant_id,
32+
name,
33+
manifest,
34+
external_id,
35+
created_at,
36+
updated_at
37+
)
38+
SELECT
39+
id,
40+
tenant_id,
41+
name,
42+
manifest,
43+
external_id,
44+
created_at,
45+
updated_at
46+
FROM agent
47+
`.execute(trx);
48+
49+
await sql`DROP TABLE agent`.execute(trx);
50+
await sql`ALTER TABLE agent_new RENAME TO agent`.execute(trx);
51+
await sql`
52+
CREATE UNIQUE INDEX ${sql.raw(AGENT_EXTERNAL_ID_UQ)}
53+
ON agent (tenant_id, external_id)
54+
WHERE external_id IS NOT NULL
55+
`.execute(trx);
56+
});
57+
} finally {
58+
await sql`PRAGMA foreign_keys = ON`.execute(db);
59+
}
60+
}
61+
62+
export async function down(db: Kysely<unknown>): Promise<void> {
63+
await sql`PRAGMA foreign_keys = OFF`.execute(db);
64+
try {
65+
await db.transaction().execute(async trx => {
66+
await sql`DROP INDEX IF EXISTS ${sql.raw(AGENT_EXTERNAL_ID_UQ)}`.execute(trx);
67+
await sql`
68+
CREATE TABLE agent_old (
69+
id TEXT NOT NULL,
70+
tenant_id TEXT NOT NULL,
71+
name TEXT NOT NULL,
72+
manifest BLOB NOT NULL,
73+
metadata BLOB NOT NULL DEFAULT (jsonb('{}')),
74+
external_id TEXT,
75+
created_at TEXT NOT NULL,
76+
updated_at TEXT NOT NULL,
77+
PRIMARY KEY (id),
78+
UNIQUE (tenant_id, name)
79+
) STRICT
80+
`.execute(trx);
81+
82+
await sql`
83+
INSERT INTO agent_old (
84+
id,
85+
tenant_id,
86+
name,
87+
manifest,
88+
metadata,
89+
external_id,
90+
created_at,
91+
updated_at
92+
)
93+
SELECT
94+
id,
95+
tenant_id,
96+
name,
97+
manifest,
98+
jsonb('{}'),
99+
external_id,
100+
created_at,
101+
updated_at
102+
FROM agent
103+
`.execute(trx);
104+
105+
await sql`DROP TABLE agent`.execute(trx);
106+
await sql`ALTER TABLE agent_old RENAME TO agent`.execute(trx);
107+
await sql`
108+
CREATE UNIQUE INDEX ${sql.raw(AGENT_EXTERNAL_ID_UQ)}
109+
ON agent (tenant_id, external_id)
110+
WHERE external_id IS NOT NULL
111+
`.execute(trx);
112+
});
113+
} finally {
114+
await sql`PRAGMA foreign_keys = ON`.execute(db);
115+
}
116+
}

‎packages/trueforge/src/db/sqlite/types.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import type {
2424
} from '@truefoundry/trueforge-core/core';
2525
import type { CurrentContextUsage } from '@truefoundry/trueforge-core/core/runtime/contextUsage';
2626
import type { ColumnType, Generated, JSONColumnType } from 'kysely';
27-
import type { AgentMetadata } from '../../schemas/agentMetadata';
2827
import type { McpServerManifest } from '../../schemas/mcpServer';
2928
import type { ModelProviderManifest } from '../../schemas/modelProvider';
3029
import type { SandboxBuildMetadata, SandboxBuildStatus, SandboxProviderManifest } from '../../schemas/sandboxProvider';
@@ -222,8 +221,6 @@ export interface AgentTable {
222221
name: string;
223222
/** AgentSpec document; replaced whole on every upsert */
224223
manifest: JsonbColumn<AgentSpec>;
225-
/** `agent.metadata` jsonb; default `{}` for existing rows */
226-
metadata: JsonbColumn<AgentMetadata>;
227224
external_id: string | null;
228225
created_at: string;
229226
updated_at: string;

‎packages/trueforge/src/schemas/agent.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const CreateAgentRequestSchema = z
1515
.strict()
1616
.openapi('CreateAgentRequest');
1717

18-
/** PUT body: full manifest replacement only (metadata is store-internal, not on the wire). */
18+
/** PUT body: full manifest replacement only. */
1919
export const UpdateAgentRequestSchema = z
2020
.object({
2121
manifest: AgentSpecSchema,

‎packages/trueforge/src/schemas/agentMetadata.ts‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)