@tickernelz/wardmote-db 2026.1108.2 → 2026.1111.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-chat-migration.test.js +2 -2
- package/dist/agent-chat-migration.test.js.map +1 -1
- package/dist/backup-lib.d.ts +3 -0
- package/dist/backup-lib.d.ts.map +1 -1
- package/dist/backup-lib.js +29 -6
- package/dist/backup-lib.js.map +1 -1
- package/dist/backup-lib.test.js +31 -16
- package/dist/backup-lib.test.js.map +1 -1
- package/dist/backup.js +4 -4
- package/dist/backup.js.map +1 -1
- package/dist/better-auth-account-issuer-migration.test.js +1 -1
- package/dist/better-auth-account-issuer-migration.test.js.map +1 -1
- package/dist/built-in-agent-unique-marker-migration.test.js +1 -1
- package/dist/built-in-agent-unique-marker-migration.test.js.map +1 -1
- package/dist/chat-github-migration.test.js +1 -1
- package/dist/chat-github-migration.test.js.map +1 -1
- package/dist/chat-identity-migration-reconciliation.test.js +5 -5
- package/dist/chat-identity-migration-reconciliation.test.js.map +1 -1
- package/dist/chat-openwa-migration.test.js +2 -2
- package/dist/chat-openwa-migration.test.js.map +1 -1
- package/dist/chat-telegram-draft-ids-migration.test.js +1 -1
- package/dist/chat-telegram-draft-ids-migration.test.js.map +1 -1
- package/dist/chat-tenant-foreign-keys.test.js +1 -1
- package/dist/chat-tenant-foreign-keys.test.js.map +1 -1
- package/dist/check-migration-safety.js +2 -2
- package/dist/check-migration-safety.js.map +1 -1
- package/dist/check-migration-safety.test.js +10 -1
- package/dist/check-migration-safety.test.js.map +1 -1
- package/dist/client-options.test.js +6 -6
- package/dist/client-options.test.js.map +1 -1
- package/dist/client.d.ts +1 -22
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +1 -16
- package/dist/client.js.map +1 -1
- package/dist/client.test.js +10 -10
- package/dist/client.test.js.map +1 -1
- package/dist/company-secret-proposals-migration.test.js +1 -1
- package/dist/company-secret-proposals-migration.test.js.map +1 -1
- package/dist/connection-grants-phase4-migration.test.js +1 -1
- package/dist/connection-grants-phase4-migration.test.js.map +1 -1
- package/dist/connections-v3-schema-core-migration.test.js +2 -2
- package/dist/connections-v3-schema-core-migration.test.js.map +1 -1
- package/dist/decision-queue-migrations.test.js +1 -1
- package/dist/decision-queue-migrations.test.js.map +1 -1
- package/dist/embedded-identity.d.ts +12 -0
- package/dist/embedded-identity.d.ts.map +1 -0
- package/dist/embedded-identity.js +96 -0
- package/dist/embedded-identity.js.map +1 -0
- package/dist/embedded-identity.test.d.ts +2 -0
- package/dist/embedded-identity.test.d.ts.map +1 -0
- package/dist/embedded-identity.test.js +91 -0
- package/dist/embedded-identity.test.js.map +1 -0
- package/dist/embedded-postgres-lifecycle.d.ts +0 -9
- package/dist/embedded-postgres-lifecycle.d.ts.map +1 -1
- package/dist/embedded-postgres-lifecycle.js +0 -9
- package/dist/embedded-postgres-lifecycle.js.map +1 -1
- package/dist/embedded-postgres-native.test.js +2 -2
- package/dist/embedded-postgres-native.test.js.map +1 -1
- package/dist/heartbeat-run-issue-privacy-migration.test.js +4 -4
- package/dist/heartbeat-run-issue-privacy-migration.test.js.map +1 -1
- package/dist/inbox-archive-agent-policies-migration.test.js +1 -1
- package/dist/inbox-archive-agent-policies-migration.test.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/issue-comment-derived-attribution-migration.test.js +1 -1
- package/dist/issue-comment-derived-attribution-migration.test.js.map +1 -1
- package/dist/issue-comment-on-behalf-migration.test.js +1 -1
- package/dist/issue-comment-on-behalf-migration.test.js.map +1 -1
- package/dist/migration-runtime.d.ts.map +1 -1
- package/dist/migration-runtime.js +21 -11
- package/dist/migration-runtime.js.map +1 -1
- package/dist/migrations/0357_drop_cloud_onboarding_seeds.sql +11 -0
- package/dist/migrations/0358_wardmote_bundled_skill_keys.sql +95 -0
- package/dist/migrations/0359_wardmote_bundled_skill_slugs.sql +100 -0
- package/dist/migrations/0360_wardmote_channel_values.sql +11 -0
- package/dist/migrations/0361_wardmote_stored_modes.sql +14 -0
- package/dist/migrations/0362_wardmote_runner_adapter_type.sql +34 -0
- package/dist/migrations/0363_wardmote_camel_keys.sql +57 -0
- package/dist/migrations/0364_wardmote_catalog_keys.sql +92 -0
- package/dist/migrations/0365_wardmote_plugin_ids.sql +118 -0
- package/dist/migrations/0366_wardmote_managed_environment_key.sql +13 -0
- package/dist/migrations/0367_wardmote_schema_ids.sql +31 -0
- package/dist/migrations/0368_wardmote_mcp_scopes.sql +27 -0
- package/dist/migrations/0369_wardmote_chat_state_key.sql +10 -0
- package/dist/migrations/0370_wardmote_wake_context_key.sql +4 -0
- package/dist/migrations/0371_wardmote_session_config_keys.sql +7 -0
- package/dist/migrations/meta/_journal.json +105 -0
- package/dist/native-runner-recovery-migration.test.js +1 -1
- package/dist/native-runner-recovery-migration.test.js.map +1 -1
- package/dist/nested-skill-folders-migration.test.js +2 -2
- package/dist/orphaned-claimed-wakeups-migration.test.js +1 -1
- package/dist/orphaned-claimed-wakeups-migration.test.js.map +1 -1
- package/dist/pipelines-schema.test.js +1 -1
- package/dist/pipelines-schema.test.js.map +1 -1
- package/dist/postgres-connection-recovery.test.js +1 -1
- package/dist/postgres-connection-recovery.test.js.map +1 -1
- package/dist/private-task-draft-assets-migration.test.js +1 -1
- package/dist/private-task-draft-assets-migration.test.js.map +1 -1
- package/dist/run-event-payload.js +1 -1
- package/dist/run-event-payload.js.map +1 -1
- package/dist/run-event-payload.test.js +1 -1
- package/dist/run-event-payload.test.js.map +1 -1
- package/dist/run-identity-migration.test.js +1 -1
- package/dist/run-identity-migration.test.js.map +1 -1
- package/dist/runtime-config.d.ts.map +1 -1
- package/dist/runtime-config.js +12 -10
- package/dist/runtime-config.js.map +1 -1
- package/dist/runtime-config.test.js +17 -17
- package/dist/runtime-config.test.js.map +1 -1
- package/dist/schema/chat_channels.d.ts +5 -5
- package/dist/schema/chat_channels.d.ts.map +1 -1
- package/dist/schema/chat_channels.js +4 -19
- package/dist/schema/chat_channels.js.map +1 -1
- package/dist/schema/company_secrets.js +1 -1
- package/dist/schema/company_secrets.js.map +1 -1
- package/dist/schema/environments.js +1 -1
- package/dist/schema/environments.js.map +1 -1
- package/dist/schema/heartbeat_runs.js +1 -1
- package/dist/schema/heartbeat_runs.js.map +1 -1
- package/dist/schema/index.d.ts +0 -1
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/index.js +0 -1
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/issue_autonomy_windows.d.ts +2 -2
- package/dist/schema/issue_autonomy_windows.js +1 -1
- package/dist/schema/issue_autonomy_windows.js.map +1 -1
- package/dist/schema/plugin_entities.d.ts +0 -14
- package/dist/schema/plugin_entities.d.ts.map +1 -1
- package/dist/schema/plugin_entities.js +0 -14
- package/dist/schema/plugin_entities.js.map +1 -1
- package/dist/schema/plugin_state.d.ts +0 -23
- package/dist/schema/plugin_state.d.ts.map +1 -1
- package/dist/schema/plugin_state.js +0 -23
- package/dist/schema/plugin_state.js.map +1 -1
- package/dist/schema/plugins.d.ts +3 -3
- package/dist/schema/plugins.d.ts.map +1 -1
- package/dist/schema/plugins.js.map +1 -1
- package/dist/schema/tool_access.js +3 -3
- package/dist/schema/tool_access.js.map +1 -1
- package/dist/schema/user_secret_definitions.js +1 -1
- package/dist/schema/user_secret_definitions.js.map +1 -1
- package/dist/session-goal-migration.test.js +3 -3
- package/dist/session-goal-migration.test.js.map +1 -1
- package/dist/speko-voice-migration.test.js +1 -1
- package/dist/speko-voice-migration.test.js.map +1 -1
- package/dist/status-card-migrations.test.js +1 -1
- package/dist/status-card-migrations.test.js.map +1 -1
- package/dist/test-embedded-postgres.d.ts.map +1 -1
- package/dist/test-embedded-postgres.js +14 -13
- package/dist/test-embedded-postgres.js.map +1 -1
- package/dist/test-embedded-postgres.test.js +3 -3
- package/dist/test-embedded-postgres.test.js.map +1 -1
- package/dist/vercel-connect-credential-source-migration.test.js +2 -2
- package/dist/vercel-connect-credential-source-migration.test.js.map +1 -1
- package/dist/wardmote-camel-key-migration.test.d.ts +2 -0
- package/dist/wardmote-camel-key-migration.test.d.ts.map +1 -0
- package/dist/wardmote-camel-key-migration.test.js +111 -0
- package/dist/wardmote-camel-key-migration.test.js.map +1 -0
- package/dist/wardmote-catalog-key-migration.test.d.ts +2 -0
- package/dist/wardmote-catalog-key-migration.test.d.ts.map +1 -0
- package/dist/wardmote-catalog-key-migration.test.js +140 -0
- package/dist/wardmote-catalog-key-migration.test.js.map +1 -0
- package/dist/wardmote-chat-state-key-migration.test.d.ts +2 -0
- package/dist/wardmote-chat-state-key-migration.test.d.ts.map +1 -0
- package/dist/wardmote-chat-state-key-migration.test.js +58 -0
- package/dist/wardmote-chat-state-key-migration.test.js.map +1 -0
- package/dist/wardmote-managed-environment-key-migration.test.d.ts +2 -0
- package/dist/wardmote-managed-environment-key-migration.test.d.ts.map +1 -0
- package/dist/wardmote-managed-environment-key-migration.test.js +67 -0
- package/dist/wardmote-managed-environment-key-migration.test.js.map +1 -0
- package/dist/wardmote-mcp-scope-migration.test.d.ts +2 -0
- package/dist/wardmote-mcp-scope-migration.test.d.ts.map +1 -0
- package/dist/wardmote-mcp-scope-migration.test.js +93 -0
- package/dist/wardmote-mcp-scope-migration.test.js.map +1 -0
- package/dist/wardmote-plugin-id-migration.test.d.ts +2 -0
- package/dist/wardmote-plugin-id-migration.test.d.ts.map +1 -0
- package/dist/wardmote-plugin-id-migration.test.js +127 -0
- package/dist/wardmote-plugin-id-migration.test.js.map +1 -0
- package/dist/wardmote-runner-adapter-type-migration.test.d.ts +2 -0
- package/dist/wardmote-runner-adapter-type-migration.test.d.ts.map +1 -0
- package/dist/wardmote-runner-adapter-type-migration.test.js +124 -0
- package/dist/wardmote-runner-adapter-type-migration.test.js.map +1 -0
- package/dist/wardmote-schema-id-migration.test.d.ts +2 -0
- package/dist/wardmote-schema-id-migration.test.d.ts.map +1 -0
- package/dist/wardmote-schema-id-migration.test.js +113 -0
- package/dist/wardmote-schema-id-migration.test.js.map +1 -0
- package/dist/wardmote-session-config-keys-migration.test.d.ts +2 -0
- package/dist/wardmote-session-config-keys-migration.test.d.ts.map +1 -0
- package/dist/wardmote-session-config-keys-migration.test.js +71 -0
- package/dist/wardmote-session-config-keys-migration.test.js.map +1 -0
- package/dist/wardmote-skill-key-migration.test.d.ts +2 -0
- package/dist/wardmote-skill-key-migration.test.d.ts.map +1 -0
- package/dist/wardmote-skill-key-migration.test.js +121 -0
- package/dist/wardmote-skill-key-migration.test.js.map +1 -0
- package/dist/wardmote-skill-slug-migration.test.d.ts +2 -0
- package/dist/wardmote-skill-slug-migration.test.d.ts.map +1 -0
- package/dist/wardmote-skill-slug-migration.test.js +128 -0
- package/dist/wardmote-skill-slug-migration.test.js.map +1 -0
- package/dist/wardmote-wake-context-key-migration.test.d.ts +2 -0
- package/dist/wardmote-wake-context-key-migration.test.d.ts.map +1 -0
- package/dist/wardmote-wake-context-key-migration.test.js +59 -0
- package/dist/wardmote-wake-context-key-migration.test.js.map +1 -0
- package/package.json +2 -2
- package/dist/schema/company_onboarding_seeds.d.ts +0 -257
- package/dist/schema/company_onboarding_seeds.d.ts.map +0 -1
- package/dist/schema/company_onboarding_seeds.js +0 -35
- package/dist/schema/company_onboarding_seeds.js.map +0 -1
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
4
|
+
import postgres from "postgres";
|
|
5
|
+
import { applyPendingMigrations } from "./client.js";
|
|
6
|
+
import { EMBEDDED_POSTGRES_TEST_TIMEOUT_MS, getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./test-embedded-postgres.js";
|
|
7
|
+
const MIGRATION_FILE = "0363_wardmote_camel_keys.sql";
|
|
8
|
+
const OLD = "paper" + "clip";
|
|
9
|
+
const cleanups = [];
|
|
10
|
+
const embeddedPostgresSupport = await getEmbeddedPostgresTestSupport();
|
|
11
|
+
const describeEmbeddedPostgres = embeddedPostgresSupport.supported ? describe : describe.skip;
|
|
12
|
+
async function migrationHash() {
|
|
13
|
+
const content = await fs.promises.readFile(new URL(`./migrations/${MIGRATION_FILE}`, import.meta.url), "utf8");
|
|
14
|
+
return createHash("sha256").update(content).digest("hex");
|
|
15
|
+
}
|
|
16
|
+
describeEmbeddedPostgres("wardmote camelCase key migration", () => {
|
|
17
|
+
afterEach(async () => {
|
|
18
|
+
await Promise.all(cleanups.splice(0).map((cleanup) => cleanup()));
|
|
19
|
+
});
|
|
20
|
+
it("renames stored camelCase keys in live rows and recent run context exactly once", async () => {
|
|
21
|
+
const database = await startEmbeddedPostgresTestDatabase("wardmote-camel-key-migration-");
|
|
22
|
+
cleanups.push(database.cleanup);
|
|
23
|
+
const sql = postgres(database.connectionString, { max: 1 });
|
|
24
|
+
cleanups.push(async () => sql.end());
|
|
25
|
+
const companyId = randomUUID();
|
|
26
|
+
const agentId = randomUUID();
|
|
27
|
+
const builtInId = randomUUID();
|
|
28
|
+
const sessionId = randomUUID();
|
|
29
|
+
const openWakeId = randomUUID();
|
|
30
|
+
const doneWakeId = randomUUID();
|
|
31
|
+
const recentRunId = randomUUID();
|
|
32
|
+
const oldRunId = randomUUID();
|
|
33
|
+
const oldRedactedRunId = randomUUID();
|
|
34
|
+
const revisionId = randomUUID();
|
|
35
|
+
await sql `INSERT INTO "companies" ("id", "name", "issue_prefix") VALUES (${companyId}, 'Keys', 'KEY')`;
|
|
36
|
+
await sql `
|
|
37
|
+
INSERT INTO "instance_settings" ("singleton_key", "experimental")
|
|
38
|
+
VALUES ('default', ${sql.json({ ["enable" + "Paper" + "clipDeveloperMode"]: true, other: 1 })})
|
|
39
|
+
ON CONFLICT ("singleton_key") DO UPDATE SET "experimental" = excluded."experimental"
|
|
40
|
+
`;
|
|
41
|
+
await sql `
|
|
42
|
+
INSERT INTO "agents" ("id", "company_id", "name", "adapter_config", "metadata")
|
|
43
|
+
VALUES
|
|
44
|
+
(${agentId}, ${companyId}, 'Agent', ${sql.json({ [`${OLD}Mcp`]: { enabled: true }, [`${OLD}McpToolsets`]: ["core"], env: { [`${OLD.toUpperCase()}_KEPT`]: "operator" }, nested: [{ [`${OLD}Wake`]: 1 }] })}, ${sql.json({})}),
|
|
45
|
+
(${builtInId}, ${companyId}, 'Built in', ${sql.json({})}, ${sql.json({ [`${OLD}BuiltInAgent`]: { key: "reflection" } })})
|
|
46
|
+
`;
|
|
47
|
+
await sql `
|
|
48
|
+
INSERT INTO "agent_config_revisions" ("id", "company_id", "agent_id", "changed_keys", "before_config", "after_config")
|
|
49
|
+
VALUES (${revisionId}, ${companyId}, ${agentId}, ${sql.json(["adapterConfig"])},
|
|
50
|
+
${sql.json({ adapterConfig: { [`${OLD}McpToolsets`]: ["core"] } })}, ${sql.json({ adapterConfig: { model: "kept" } })})
|
|
51
|
+
`;
|
|
52
|
+
await sql `
|
|
53
|
+
INSERT INTO "agent_task_sessions" ("id", "company_id", "agent_id", "adapter_type", "task_key", "session_params_json")
|
|
54
|
+
VALUES (${sessionId}, ${companyId}, ${agentId}, 'omp_local', 'issue:a', ${sql.json({ [`${OLD}ConnectionInstructions`]: "text" })})
|
|
55
|
+
`;
|
|
56
|
+
await sql `
|
|
57
|
+
INSERT INTO "agent_wakeup_requests" ("id", "company_id", "agent_id", "source", "status", "payload")
|
|
58
|
+
VALUES
|
|
59
|
+
(${openWakeId}, ${companyId}, ${agentId}, 'on_demand', 'queued', ${sql.json({ [`${OLD}AgentMessage`]: "hi" })}),
|
|
60
|
+
(${doneWakeId}, ${companyId}, ${agentId}, 'on_demand', 'completed', ${sql.json({ [`${OLD}AgentMessage`]: "old" })})
|
|
61
|
+
`;
|
|
62
|
+
await sql `
|
|
63
|
+
INSERT INTO "heartbeat_runs" ("id", "company_id", "agent_id", "status", "created_at", "context_snapshot")
|
|
64
|
+
VALUES
|
|
65
|
+
(${recentRunId}, ${companyId}, ${agentId}, 'succeeded', now(), ${sql.json({ [`${OLD}Openwa`]: { chat: 1 }, issueId: "i", [`${OLD}Wake`]: { reason: "x" } })}),
|
|
66
|
+
(${oldRunId}, ${companyId}, ${agentId}, 'succeeded', now() - interval '30 days', ${sql.json({ [`${OLD}Wake`]: { reason: "y" } })}),
|
|
67
|
+
(${oldRedactedRunId}, ${companyId}, ${agentId}, 'failed', now() - interval '30 days', ${sql.json({ [`${OLD}SecretRedactions`]: ["s"] })})
|
|
68
|
+
`;
|
|
69
|
+
const hash = await migrationHash();
|
|
70
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
71
|
+
await applyPendingMigrations(database.connectionString);
|
|
72
|
+
const [settings] = await sql `SELECT "experimental" FROM "instance_settings" WHERE "singleton_key" = 'default'`;
|
|
73
|
+
expect(settings.experimental).toEqual({ enableWardmoteDeveloperMode: true, other: 1 });
|
|
74
|
+
const agents = new Map((await sql `SELECT "id", "adapter_config", "metadata" FROM "agents"`).map((row) => [row.id, row]));
|
|
75
|
+
expect(agents.get(agentId)?.adapter_config).toEqual({
|
|
76
|
+
wardmoteMcp: { enabled: true },
|
|
77
|
+
wardmoteMcpToolsets: ["core"],
|
|
78
|
+
env: { [`${OLD.toUpperCase()}_KEPT`]: "operator" },
|
|
79
|
+
nested: [{ wardmoteWake: 1 }],
|
|
80
|
+
});
|
|
81
|
+
expect(agents.get(builtInId)?.metadata).toEqual({ wardmoteBuiltInAgent: { key: "reflection" } });
|
|
82
|
+
const [revision] = await sql `SELECT "before_config", "after_config" FROM "agent_config_revisions" WHERE "id" = ${revisionId}`;
|
|
83
|
+
expect(revision).toEqual({ before_config: { adapterConfig: { wardmoteMcpToolsets: ["core"] } }, after_config: { adapterConfig: { model: "kept" } } });
|
|
84
|
+
const [session] = await sql `SELECT "session_params_json" FROM "agent_task_sessions" WHERE "id" = ${sessionId}`;
|
|
85
|
+
expect(session.session_params_json).toEqual({ wardmoteConnectionInstructions: "text" });
|
|
86
|
+
const wakes = new Map((await sql `SELECT "id", "payload" FROM "agent_wakeup_requests"`).map((row) => [row.id, row.payload]));
|
|
87
|
+
expect(wakes.get(openWakeId)).toEqual({ wardmoteAgentMessage: "hi" });
|
|
88
|
+
expect(wakes.get(doneWakeId)).toEqual({ [`${OLD}AgentMessage`]: "old" });
|
|
89
|
+
const runs = new Map((await sql `SELECT "id", "context_snapshot" FROM "heartbeat_runs"`).map((row) => [row.id, row.context_snapshot]));
|
|
90
|
+
expect(runs.get(recentRunId)).toEqual({ wardmoteOpenwa: { chat: 1 }, issueId: "i", wardmoteWake: { reason: "x" } });
|
|
91
|
+
expect(runs.get(oldRunId)).toEqual({ [`${OLD}Wake`]: { reason: "y" } });
|
|
92
|
+
expect(runs.get(oldRedactedRunId)).toEqual({ wardmoteSecretRedactions: ["s"] });
|
|
93
|
+
await expect(sql `
|
|
94
|
+
INSERT INTO "agents" ("id", "company_id", "name", "metadata")
|
|
95
|
+
VALUES (${randomUUID()}, ${companyId}, 'Duplicate', ${sql.json({ wardmoteBuiltInAgent: { key: "reflection" } })})
|
|
96
|
+
`).rejects.toMatchObject({ code: "23505" });
|
|
97
|
+
const snapshot = async () => ({
|
|
98
|
+
settings: await sql `SELECT "experimental" FROM "instance_settings"`,
|
|
99
|
+
agents: await sql `SELECT "id", "adapter_config", "metadata" FROM "agents" ORDER BY "id"`,
|
|
100
|
+
revisions: await sql `SELECT "before_config", "after_config" FROM "agent_config_revisions"`,
|
|
101
|
+
sessions: await sql `SELECT "session_params_json" FROM "agent_task_sessions"`,
|
|
102
|
+
wakes: await sql `SELECT "id", "payload" FROM "agent_wakeup_requests" ORDER BY "id"`,
|
|
103
|
+
runs: await sql `SELECT "id", "context_snapshot" FROM "heartbeat_runs" ORDER BY "id"`,
|
|
104
|
+
});
|
|
105
|
+
const before = await snapshot();
|
|
106
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
107
|
+
await applyPendingMigrations(database.connectionString);
|
|
108
|
+
expect(await snapshot()).toEqual(before);
|
|
109
|
+
}, EMBEDDED_POSTGRES_TEST_TIMEOUT_MS);
|
|
110
|
+
});
|
|
111
|
+
//# sourceMappingURL=wardmote-camel-key-migration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-camel-key-migration.test.js","sourceRoot":"","sources":["../src/wardmote-camel-key-migration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-catalog-key-migration.test.d.ts","sourceRoot":"","sources":["../src/wardmote-catalog-key-migration.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
4
|
+
import postgres from "postgres";
|
|
5
|
+
import { applyPendingMigrations } from "./client.js";
|
|
6
|
+
import { EMBEDDED_POSTGRES_TEST_TIMEOUT_MS, getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./test-embedded-postgres.js";
|
|
7
|
+
const MIGRATION_FILE = "0364_wardmote_catalog_keys.sql";
|
|
8
|
+
const LEGACY_OWNER = ["paper", "clipai"].join("");
|
|
9
|
+
const LEGACY_CATEGORY = ["paper", "clip-operations"].join("");
|
|
10
|
+
const LEGACY_CORE = ["paper", "clip-core"].join("");
|
|
11
|
+
const cleanups = [];
|
|
12
|
+
const embeddedPostgresSupport = await getEmbeddedPostgresTestSupport();
|
|
13
|
+
const describeEmbeddedPostgres = embeddedPostgresSupport.supported ? describe : describe.skip;
|
|
14
|
+
async function migrationHash() {
|
|
15
|
+
const content = await fs.promises.readFile(new URL(`./migrations/${MIGRATION_FILE}`, import.meta.url), "utf8");
|
|
16
|
+
return createHash("sha256").update(content).digest("hex");
|
|
17
|
+
}
|
|
18
|
+
describeEmbeddedPostgres("wardmote catalog key migration", () => {
|
|
19
|
+
afterEach(async () => {
|
|
20
|
+
await Promise.all(cleanups.splice(0).map((cleanup) => cleanup()));
|
|
21
|
+
});
|
|
22
|
+
it("moves stored catalog keys, categories, and the bundled core folder to Wardmote names exactly once", async () => {
|
|
23
|
+
const database = await startEmbeddedPostgresTestDatabase("wardmote-catalog-key-migration-");
|
|
24
|
+
cleanups.push(database.cleanup);
|
|
25
|
+
const sql = postgres(database.connectionString, { max: 1 });
|
|
26
|
+
cleanups.push(async () => sql.end());
|
|
27
|
+
const companyId = randomUUID();
|
|
28
|
+
const conflictCompanyId = randomUUID();
|
|
29
|
+
const catalogSkillId = randomUUID();
|
|
30
|
+
const customSkillId = randomUUID();
|
|
31
|
+
const conflictLegacyId = randomUUID();
|
|
32
|
+
const conflictCurrentId = randomUUID();
|
|
33
|
+
const agentId = randomUUID();
|
|
34
|
+
const untouchedAgentId = randomUUID();
|
|
35
|
+
const revisionId = randomUUID();
|
|
36
|
+
const rootFolderId = randomUUID();
|
|
37
|
+
const coreFolderId = randomUUID();
|
|
38
|
+
const legacyKey = `${LEGACY_OWNER}/bundled/${LEGACY_CATEGORY}/task-planning`;
|
|
39
|
+
const currentKey = "tickernelz/bundled/wardmote-operations/task-planning";
|
|
40
|
+
await sql `
|
|
41
|
+
INSERT INTO "companies" ("id", "name", "issue_prefix")
|
|
42
|
+
VALUES (${companyId}, 'Catalog', 'CAT'), (${conflictCompanyId}, 'Conflict', 'CFL')
|
|
43
|
+
`;
|
|
44
|
+
await sql `
|
|
45
|
+
INSERT INTO "folders" ("id", "company_id", "kind", "parent_id", "name", "slug", "system_key")
|
|
46
|
+
VALUES
|
|
47
|
+
(${rootFolderId}, ${companyId}, 'skill', NULL, 'Bundled', 'bundled', 'bundled'),
|
|
48
|
+
(${coreFolderId}, ${companyId}, 'skill', ${rootFolderId}, 'Paperclip Core', ${LEGACY_CORE}, ${`bundled:${LEGACY_CORE}`})
|
|
49
|
+
`;
|
|
50
|
+
await sql `
|
|
51
|
+
INSERT INTO "company_skills" ("id", "company_id", "key", "slug", "name", "markdown", "metadata")
|
|
52
|
+
VALUES
|
|
53
|
+
(${catalogSkillId}, ${companyId}, ${legacyKey}, 'task-planning', 'Task planning', '# Plan',
|
|
54
|
+
${sql.json({
|
|
55
|
+
skillKey: legacyKey,
|
|
56
|
+
sourceKind: "catalog",
|
|
57
|
+
catalogId: `${LEGACY_OWNER}:bundled:${LEGACY_CATEGORY}:task-planning`,
|
|
58
|
+
catalogKey: legacyKey,
|
|
59
|
+
catalogCategory: LEGACY_CATEGORY,
|
|
60
|
+
catalogPath: `bundled/${LEGACY_CATEGORY}/task-planning/SKILL.md`,
|
|
61
|
+
note: `${LEGACY_OWNER}/paperclip stays`,
|
|
62
|
+
})}),
|
|
63
|
+
(${customSkillId}, ${companyId}, 'acme/tools/reviewer', 'reviewer', 'Reviewer', '# Reviewer', NULL),
|
|
64
|
+
(${conflictLegacyId}, ${conflictCompanyId}, ${legacyKey}, 'task-planning', 'Task planning', '# Plan', NULL),
|
|
65
|
+
(${conflictCurrentId}, ${conflictCompanyId}, ${currentKey}, 'task-planning', 'Task planning', '# Plan', NULL)
|
|
66
|
+
`;
|
|
67
|
+
await sql `
|
|
68
|
+
INSERT INTO "agents" ("id", "company_id", "name", "adapter_config", "metadata")
|
|
69
|
+
VALUES
|
|
70
|
+
(${agentId}, ${companyId}, 'Agent', ${sql.json({
|
|
71
|
+
model: "kept",
|
|
72
|
+
wardmoteSkillSync: { desiredSkills: [legacyKey, "acme/tools/reviewer"] },
|
|
73
|
+
})}, ${sql.json({ catalogTeam: { catalogKey: `${LEGACY_OWNER}/bundled/software-development/review` } })}),
|
|
74
|
+
(${untouchedAgentId}, ${companyId}, 'Untouched', ${sql.json({ wardmoteSkillSync: { desiredSkills: ["acme/tools/reviewer"] } })}, NULL)
|
|
75
|
+
`;
|
|
76
|
+
await sql `
|
|
77
|
+
INSERT INTO "agent_config_revisions" ("id", "company_id", "agent_id", "changed_keys", "before_config", "after_config")
|
|
78
|
+
VALUES (${revisionId}, ${companyId}, ${agentId}, ${sql.json(["adapterConfig"])},
|
|
79
|
+
${sql.json({ adapterConfig: { wardmoteSkillSync: { desiredSkills: ["acme/tools/reviewer"] } } })},
|
|
80
|
+
${sql.json({ adapterConfig: { wardmoteSkillSync: { desiredSkills: [legacyKey] } } })})
|
|
81
|
+
`;
|
|
82
|
+
const hash = await migrationHash();
|
|
83
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
84
|
+
await applyPendingMigrations(database.connectionString);
|
|
85
|
+
const [folder] = await sql `
|
|
86
|
+
SELECT "name", "slug", "system_key" FROM "folders" WHERE "id" = ${coreFolderId}
|
|
87
|
+
`;
|
|
88
|
+
expect(folder).toEqual({ name: "Wardmote Core", slug: "wardmote-core", system_key: "bundled:wardmote-core" });
|
|
89
|
+
const skills = await sql `
|
|
90
|
+
SELECT "id", "key", "metadata" FROM "company_skills"
|
|
91
|
+
`;
|
|
92
|
+
const byId = new Map(skills.map((row) => [row.id, row]));
|
|
93
|
+
expect(byId.get(catalogSkillId)).toEqual({
|
|
94
|
+
id: catalogSkillId,
|
|
95
|
+
key: currentKey,
|
|
96
|
+
metadata: {
|
|
97
|
+
skillKey: currentKey,
|
|
98
|
+
sourceKind: "catalog",
|
|
99
|
+
catalogId: "tickernelz:bundled:wardmote-operations:task-planning",
|
|
100
|
+
catalogKey: currentKey,
|
|
101
|
+
catalogCategory: "wardmote-operations",
|
|
102
|
+
catalogPath: "bundled/wardmote-operations/task-planning/SKILL.md",
|
|
103
|
+
note: `${LEGACY_OWNER}/paperclip stays`,
|
|
104
|
+
},
|
|
105
|
+
});
|
|
106
|
+
expect(byId.get(customSkillId)?.key).toBe("acme/tools/reviewer");
|
|
107
|
+
expect(byId.get(conflictLegacyId)?.key).toBe(legacyKey);
|
|
108
|
+
expect(byId.get(conflictCurrentId)?.key).toBe(currentKey);
|
|
109
|
+
const agents = await sql `
|
|
110
|
+
SELECT "id", "adapter_config", "metadata" FROM "agents"
|
|
111
|
+
`;
|
|
112
|
+
const agentById = new Map(agents.map((row) => [row.id, row]));
|
|
113
|
+
expect(agentById.get(agentId).adapter_config).toEqual({
|
|
114
|
+
model: "kept",
|
|
115
|
+
wardmoteSkillSync: { desiredSkills: [currentKey, "acme/tools/reviewer"] },
|
|
116
|
+
});
|
|
117
|
+
expect(agentById.get(agentId).metadata).toEqual({
|
|
118
|
+
catalogTeam: { catalogKey: "tickernelz/bundled/software-development/review" },
|
|
119
|
+
});
|
|
120
|
+
expect(agentById.get(untouchedAgentId).adapter_config).toEqual({
|
|
121
|
+
wardmoteSkillSync: { desiredSkills: ["acme/tools/reviewer"] },
|
|
122
|
+
});
|
|
123
|
+
const [revision] = await sql `
|
|
124
|
+
SELECT "before_config", "after_config" FROM "agent_config_revisions" WHERE "id" = ${revisionId}
|
|
125
|
+
`;
|
|
126
|
+
expect(revision.after_config).toEqual({ adapterConfig: { wardmoteSkillSync: { desiredSkills: [currentKey] } } });
|
|
127
|
+
expect(revision.before_config).toEqual({ adapterConfig: { wardmoteSkillSync: { desiredSkills: ["acme/tools/reviewer"] } } });
|
|
128
|
+
const snapshot = async () => ({
|
|
129
|
+
folders: await sql `SELECT * FROM "folders" ORDER BY "id"`,
|
|
130
|
+
skills: await sql `SELECT "id", "key", "metadata", "updated_at" FROM "company_skills" ORDER BY "id"`,
|
|
131
|
+
agents: await sql `SELECT "id", "adapter_config", "metadata" FROM "agents" ORDER BY "id"`,
|
|
132
|
+
revisions: await sql `SELECT "id", "before_config", "after_config" FROM "agent_config_revisions" ORDER BY "id"`,
|
|
133
|
+
});
|
|
134
|
+
const before = await snapshot();
|
|
135
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
136
|
+
await applyPendingMigrations(database.connectionString);
|
|
137
|
+
expect(await snapshot()).toEqual(before);
|
|
138
|
+
}, EMBEDDED_POSTGRES_TEST_TIMEOUT_MS);
|
|
139
|
+
});
|
|
140
|
+
//# sourceMappingURL=wardmote-catalog-key-migration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-catalog-key-migration.test.js","sourceRoot":"","sources":["../src/wardmote-catalog-key-migration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-chat-state-key-migration.test.d.ts","sourceRoot":"","sources":["../src/wardmote-chat-state-key-migration.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
4
|
+
import postgres from "postgres";
|
|
5
|
+
import { applyPendingMigrations } from "./client.js";
|
|
6
|
+
import { EMBEDDED_POSTGRES_TEST_TIMEOUT_MS, getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./test-embedded-postgres.js";
|
|
7
|
+
const MIGRATION_FILE = "0369_wardmote_chat_state_key.sql";
|
|
8
|
+
const OLD_KEY = [["paper", "clip"].join(""), "github-webhook-recovery", "v1"].join(":");
|
|
9
|
+
const NEW_KEY = "wardmote:github-webhook-recovery:v1";
|
|
10
|
+
const cleanups = [];
|
|
11
|
+
const embeddedPostgresSupport = await getEmbeddedPostgresTestSupport();
|
|
12
|
+
const describeEmbeddedPostgres = embeddedPostgresSupport.supported ? describe : describe.skip;
|
|
13
|
+
async function migrationHash() {
|
|
14
|
+
const content = await fs.promises.readFile(new URL(`./migrations/${MIGRATION_FILE}`, import.meta.url), "utf8");
|
|
15
|
+
return createHash("sha256").update(content).digest("hex");
|
|
16
|
+
}
|
|
17
|
+
describeEmbeddedPostgres("wardmote chat state key migration", () => {
|
|
18
|
+
afterEach(async () => {
|
|
19
|
+
await Promise.all(cleanups.splice(0).map((cleanup) => cleanup()));
|
|
20
|
+
});
|
|
21
|
+
it("renames the stored GitHub recovery key and keeps a newer key on conflict", async () => {
|
|
22
|
+
const database = await startEmbeddedPostgresTestDatabase("wardmote-chat-state-key-migration-");
|
|
23
|
+
cleanups.push(database.cleanup);
|
|
24
|
+
const sql = postgres(database.connectionString, { max: 1, onnotice: () => { } });
|
|
25
|
+
cleanups.push(async () => sql.end());
|
|
26
|
+
const companyId = randomUUID();
|
|
27
|
+
const onlyOld = randomUUID();
|
|
28
|
+
const both = randomUUID();
|
|
29
|
+
await sql `SET session_replication_role = replica`;
|
|
30
|
+
await sql `
|
|
31
|
+
INSERT INTO "chat_sdk_state" ("company_id", "endpoint_id", "state_key", "value")
|
|
32
|
+
VALUES
|
|
33
|
+
(${companyId}, ${onlyOld}, ${OLD_KEY}, ${sql.json({ cursor: "old-only" })}),
|
|
34
|
+
(${companyId}, ${onlyOld}, 'other:key', ${sql.json({ keep: true })}),
|
|
35
|
+
(${companyId}, ${both}, ${OLD_KEY}, ${sql.json({ cursor: "stale" })}),
|
|
36
|
+
(${companyId}, ${both}, ${NEW_KEY}, ${sql.json({ cursor: "current" })})
|
|
37
|
+
`;
|
|
38
|
+
await sql `SET session_replication_role = DEFAULT`;
|
|
39
|
+
const hash = await migrationHash();
|
|
40
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
41
|
+
await applyPendingMigrations(database.connectionString);
|
|
42
|
+
const snapshot = async () => sql `
|
|
43
|
+
SELECT "endpoint_id", "state_key", "value" FROM "chat_sdk_state" ORDER BY "endpoint_id", "state_key"
|
|
44
|
+
`;
|
|
45
|
+
const rows = await snapshot();
|
|
46
|
+
expect(rows.filter((row) => row.endpoint_id === onlyOld).map((row) => [row.state_key, row.value])).toEqual([
|
|
47
|
+
["other:key", { keep: true }],
|
|
48
|
+
[NEW_KEY, { cursor: "old-only" }],
|
|
49
|
+
]);
|
|
50
|
+
expect(rows.filter((row) => row.endpoint_id === both).map((row) => [row.state_key, row.value])).toEqual([
|
|
51
|
+
[NEW_KEY, { cursor: "current" }],
|
|
52
|
+
]);
|
|
53
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
54
|
+
await applyPendingMigrations(database.connectionString);
|
|
55
|
+
expect(await snapshot()).toEqual(rows);
|
|
56
|
+
}, EMBEDDED_POSTGRES_TEST_TIMEOUT_MS);
|
|
57
|
+
});
|
|
58
|
+
//# sourceMappingURL=wardmote-chat-state-key-migration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-chat-state-key-migration.test.js","sourceRoot":"","sources":["../src/wardmote-chat-state-key-migration.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,iCAAiC,EACjC,8BAA8B,EAC9B,iCAAiC,GAClC,MAAM,6BAA6B,CAAC;AAErC,MAAM,cAAc,GAAG,kCAAkC,CAAC;AAC1D,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,yBAAyB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxF,MAAM,OAAO,GAAG,qCAAqC,CAAC;AACtD,MAAM,QAAQ,GAA+B,EAAE,CAAC;AAChD,MAAM,uBAAuB,GAAG,MAAM,8BAA8B,EAAE,CAAC;AACvE,MAAM,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;AAE9F,KAAK,UAAU,aAAa;IAC1B,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,gBAAgB,cAAc,EAAE,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/G,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC;AAED,wBAAwB,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjE,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;QACxF,MAAM,QAAQ,GAAG,MAAM,iCAAiC,CAAC,oCAAoC,CAAC,CAAC;QAC/F,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAChC,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC,CAAC;QAChF,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAErC,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;QAC1B,MAAM,GAAG,CAAA,wCAAwC,CAAC;QAClD,MAAM,GAAG,CAAA;;;WAGF,SAAS,KAAK,OAAO,KAAK,OAAO,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;WACtE,SAAS,KAAK,OAAO,kBAAkB,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;WAC/D,SAAS,KAAK,IAAI,KAAK,OAAO,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;WAChE,SAAS,KAAK,IAAI,KAAK,OAAO,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;KACxE,CAAC;QACF,MAAM,GAAG,CAAA,wCAAwC,CAAC;QAElD,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC;QACnC,MAAM,GAAG,CAAA,+DAA+D,IAAI,EAAE,CAAC;QAC/E,MAAM,sBAAsB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE,CAAC,GAAG,CAA8D;;KAE7F,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,KAAK,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACzG,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAC7B,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;SAClC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACtG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;SACjC,CAAC,CAAC;QAEH,MAAM,GAAG,CAAA,+DAA+D,IAAI,EAAE,CAAC;QAC/E,MAAM,sBAAsB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC,EAAE,iCAAiC,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-managed-environment-key-migration.test.d.ts","sourceRoot":"","sources":["../src/wardmote-managed-environment-key-migration.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
4
|
+
import postgres from "postgres";
|
|
5
|
+
import { applyPendingMigrations } from "./client.js";
|
|
6
|
+
import { EMBEDDED_POSTGRES_TEST_TIMEOUT_MS, getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./test-embedded-postgres.js";
|
|
7
|
+
const MIGRATION_FILE = "0366_wardmote_managed_environment_key.sql";
|
|
8
|
+
const LEGACY_KEY = ["managedBy", "Paperclip"].join("");
|
|
9
|
+
const LEGACY_DESCRIPTION = `Default execution environment for ${["Paper", "clip"].join("")} runs on this machine.`;
|
|
10
|
+
const cleanups = [];
|
|
11
|
+
const embeddedPostgresSupport = await getEmbeddedPostgresTestSupport();
|
|
12
|
+
const describeEmbeddedPostgres = embeddedPostgresSupport.supported ? describe : describe.skip;
|
|
13
|
+
async function migrationHash() {
|
|
14
|
+
const content = await fs.promises.readFile(new URL(`./migrations/${MIGRATION_FILE}`, import.meta.url), "utf8");
|
|
15
|
+
return createHash("sha256").update(content).digest("hex");
|
|
16
|
+
}
|
|
17
|
+
describeEmbeddedPostgres("wardmote managed environment key migration", () => {
|
|
18
|
+
afterEach(async () => {
|
|
19
|
+
await Promise.all(cleanups.splice(0).map((cleanup) => cleanup()));
|
|
20
|
+
});
|
|
21
|
+
it("moves the managed marker and default description, and keeps the managed sandbox unique", async () => {
|
|
22
|
+
const database = await startEmbeddedPostgresTestDatabase("wardmote-managed-env-key-migration-");
|
|
23
|
+
cleanups.push(database.cleanup);
|
|
24
|
+
const sql = postgres(database.connectionString, { max: 1, onnotice: () => { } });
|
|
25
|
+
cleanups.push(async () => sql.end());
|
|
26
|
+
const [local] = await sql `SELECT "id" FROM "environments" WHERE "driver" = 'local'`;
|
|
27
|
+
const localId = local.id;
|
|
28
|
+
const sandboxId = randomUUID();
|
|
29
|
+
const tenantId = randomUUID();
|
|
30
|
+
await sql `DROP INDEX IF EXISTS "environments_managed_sandbox_idx"`;
|
|
31
|
+
await sql `
|
|
32
|
+
UPDATE "environments"
|
|
33
|
+
SET "description" = ${LEGACY_DESCRIPTION}, "metadata" = ${sql.json({ defaultForInstance: true, [LEGACY_KEY]: true })}
|
|
34
|
+
WHERE "id" = ${localId}
|
|
35
|
+
`;
|
|
36
|
+
await sql `
|
|
37
|
+
INSERT INTO "environments" ("id", "name", "description", "driver", "metadata")
|
|
38
|
+
VALUES
|
|
39
|
+
(${sandboxId}, 'Managed sandbox', 'Custom text', 'sandbox', ${sql.json({ [LEGACY_KEY]: true, managedSandboxProvider: "kubernetes" })}),
|
|
40
|
+
(${tenantId}, 'Tenant sandbox', NULL, 'sandbox', ${sql.json({ owner: "tenant" })})
|
|
41
|
+
`;
|
|
42
|
+
const hash = await migrationHash();
|
|
43
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
44
|
+
await applyPendingMigrations(database.connectionString);
|
|
45
|
+
const rows = await sql `
|
|
46
|
+
SELECT "id", "description", "metadata" FROM "environments"
|
|
47
|
+
`;
|
|
48
|
+
const byId = new Map(rows.map((row) => [row.id, row]));
|
|
49
|
+
expect(byId.get(localId)).toEqual({
|
|
50
|
+
id: localId,
|
|
51
|
+
description: "Default execution environment for Wardmote runs on this machine.",
|
|
52
|
+
metadata: { defaultForInstance: true, managedByWardmote: true },
|
|
53
|
+
});
|
|
54
|
+
expect(byId.get(sandboxId).metadata).toEqual({ managedByWardmote: true, managedSandboxProvider: "kubernetes" });
|
|
55
|
+
expect(byId.get(sandboxId).description).toBe("Custom text");
|
|
56
|
+
expect(byId.get(tenantId).metadata).toEqual({ owner: "tenant" });
|
|
57
|
+
await expect(sql `
|
|
58
|
+
INSERT INTO "environments" ("name", "driver", "metadata")
|
|
59
|
+
VALUES ('Second managed', 'sandbox', ${sql.json({ managedByWardmote: true })})
|
|
60
|
+
`).rejects.toMatchObject({ constraint_name: "environments_managed_sandbox_idx" });
|
|
61
|
+
const before = await sql `SELECT "id", "description", "metadata" FROM "environments" ORDER BY "id"`;
|
|
62
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
63
|
+
await applyPendingMigrations(database.connectionString);
|
|
64
|
+
expect(await sql `SELECT "id", "description", "metadata" FROM "environments" ORDER BY "id"`).toEqual(before);
|
|
65
|
+
}, EMBEDDED_POSTGRES_TEST_TIMEOUT_MS);
|
|
66
|
+
});
|
|
67
|
+
//# sourceMappingURL=wardmote-managed-environment-key-migration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-managed-environment-key-migration.test.js","sourceRoot":"","sources":["../src/wardmote-managed-environment-key-migration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-mcp-scope-migration.test.d.ts","sourceRoot":"","sources":["../src/wardmote-mcp-scope-migration.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
4
|
+
import postgres from "postgres";
|
|
5
|
+
import { applyPendingMigrations } from "./client.js";
|
|
6
|
+
import { EMBEDDED_POSTGRES_TEST_TIMEOUT_MS, getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./test-embedded-postgres.js";
|
|
7
|
+
const MIGRATION_FILE = "0368_wardmote_mcp_scopes.sql";
|
|
8
|
+
const OLD = ["paper", "clip"].join("");
|
|
9
|
+
const cleanups = [];
|
|
10
|
+
const embeddedPostgresSupport = await getEmbeddedPostgresTestSupport();
|
|
11
|
+
const describeEmbeddedPostgres = embeddedPostgresSupport.supported ? describe : describe.skip;
|
|
12
|
+
async function migrationHash() {
|
|
13
|
+
const content = await fs.promises.readFile(new URL(`./migrations/${MIGRATION_FILE}`, import.meta.url), "utf8");
|
|
14
|
+
return createHash("sha256").update(content).digest("hex");
|
|
15
|
+
}
|
|
16
|
+
describeEmbeddedPostgres("wardmote MCP scope migration", () => {
|
|
17
|
+
afterEach(async () => {
|
|
18
|
+
await Promise.all(cleanups.splice(0).map((cleanup) => cleanup()));
|
|
19
|
+
});
|
|
20
|
+
it("renames stored OAuth scopes and event names and keeps other values", async () => {
|
|
21
|
+
const database = await startEmbeddedPostgresTestDatabase("wardmote-mcp-scope-migration-");
|
|
22
|
+
cleanups.push(database.cleanup);
|
|
23
|
+
const sql = postgres(database.connectionString, { max: 1, onnotice: () => { } });
|
|
24
|
+
cleanups.push(async () => sql.end());
|
|
25
|
+
const companyId = randomUUID();
|
|
26
|
+
const userId = "user-1";
|
|
27
|
+
const clientId = "client-1";
|
|
28
|
+
const grantId = randomUUID();
|
|
29
|
+
const subscriptionId = "sub-1";
|
|
30
|
+
const otherSubscriptionId = "sub-2";
|
|
31
|
+
const scopes = (prefix) => [`${prefix}:read`, `${prefix}:write`, "offline_access", `${prefix}:configure`];
|
|
32
|
+
await sql `INSERT INTO "companies" ("id", "name", "issue_prefix") VALUES (${companyId}, 'Scopes', 'SCO')`;
|
|
33
|
+
await sql `INSERT INTO "user" ("id", "name", "email", "email_verified", "created_at", "updated_at") VALUES (${userId}, 'U', 'u@example.com', true, now(), now())`;
|
|
34
|
+
const taskId = randomUUID();
|
|
35
|
+
await sql `INSERT INTO "issues" ("id", "company_id", "title", "identifier") VALUES (${taskId}, ${companyId}, 'Task', 'SCO-1')`;
|
|
36
|
+
await sql `INSERT INTO "mcp_oauth_clients" ("id", "name", "redirect_uris") VALUES (${clientId}, 'Client', ${sql.json(["https://client.example/cb"])})`;
|
|
37
|
+
await sql `
|
|
38
|
+
INSERT INTO "mcp_oauth_grants" ("id", "company_id", "user_id", "client_id", "resource", "scopes")
|
|
39
|
+
VALUES (${grantId}, ${companyId}, ${userId}, ${clientId}, 'https://wardmote.example/mcp', ${sql.json(scopes(OLD))})
|
|
40
|
+
`;
|
|
41
|
+
await sql `
|
|
42
|
+
INSERT INTO "mcp_oauth_requests" ("id", "client_id", "redirect_uri", "resource", "scopes", "challenge", "expires_at")
|
|
43
|
+
VALUES ('request-1', ${clientId}, 'https://client.example/cb', 'https://wardmote.example/mcp', ${sql.json([`${OLD}:agent`, "offline_access"])}, 'c', now() + interval '1 hour')
|
|
44
|
+
`;
|
|
45
|
+
await sql `
|
|
46
|
+
INSERT INTO "mcp_oauth_device_requests" ("client_id", "device_code_hash", "user_code_hash", "resource", "scopes", "source_hash", "expires_at")
|
|
47
|
+
VALUES (${clientId}, 'd', 'u', 'https://wardmote.example/mcp', ${sql.json([`${OLD}:read`, "custom:scope"])}, 's', now() + interval '1 hour')
|
|
48
|
+
`;
|
|
49
|
+
await sql `
|
|
50
|
+
INSERT INTO "mcp_event_subscriptions" ("id", "company_id", "grant_id", "name", "task_id", "arguments", "delivery_material", "verified_at", "expires_at")
|
|
51
|
+
VALUES
|
|
52
|
+
(${subscriptionId}, ${companyId}, ${grantId}, ${`${OLD}.task.status_changed`}, ${taskId}, ${sql.json({ companyId })}, ${sql.json({})}, now(), now() + interval '1 day'),
|
|
53
|
+
(${otherSubscriptionId}, ${companyId}, ${grantId}, 'custom.event', ${taskId}, ${sql.json({ companyId })}, ${sql.json({})}, now(), now() + interval '1 day')
|
|
54
|
+
`;
|
|
55
|
+
await sql `
|
|
56
|
+
INSERT INTO "mcp_event_deliveries" ("subscription_id", "activity_id", "event")
|
|
57
|
+
VALUES
|
|
58
|
+
(${subscriptionId}, ${randomUUID()}, ${sql.json({ eventId: "e1", name: `${OLD}.task.status_changed`, data: { companyId } })}),
|
|
59
|
+
(${subscriptionId}, ${randomUUID()}, ${sql.json({})})
|
|
60
|
+
`;
|
|
61
|
+
const hash = await migrationHash();
|
|
62
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
63
|
+
await applyPendingMigrations(database.connectionString);
|
|
64
|
+
const [grant] = await sql `SELECT "scopes" FROM "mcp_oauth_grants" WHERE "id" = ${grantId}`;
|
|
65
|
+
expect(grant.scopes).toEqual(scopes("wardmote"));
|
|
66
|
+
const [request] = await sql `SELECT "scopes" FROM "mcp_oauth_requests"`;
|
|
67
|
+
expect(request.scopes).toEqual(["wardmote:agent", "offline_access"]);
|
|
68
|
+
const [device] = await sql `SELECT "scopes" FROM "mcp_oauth_device_requests"`;
|
|
69
|
+
expect(device.scopes).toEqual(["wardmote:read", "custom:scope"]);
|
|
70
|
+
const subscriptions = await sql `SELECT "id", "name" FROM "mcp_event_subscriptions" ORDER BY "id"`;
|
|
71
|
+
expect(subscriptions).toEqual([
|
|
72
|
+
{ id: subscriptionId, name: "wardmote.task.status_changed" },
|
|
73
|
+
{ id: otherSubscriptionId, name: "custom.event" },
|
|
74
|
+
]);
|
|
75
|
+
const deliveries = await sql `SELECT "event" FROM "mcp_event_deliveries" ORDER BY "event" ? 'name' DESC`;
|
|
76
|
+
expect(deliveries.map((row) => row.event)).toEqual([
|
|
77
|
+
{ eventId: "e1", name: "wardmote.task.status_changed", data: { companyId } },
|
|
78
|
+
{},
|
|
79
|
+
]);
|
|
80
|
+
const snapshot = async () => ({
|
|
81
|
+
grants: await sql `SELECT "id", "scopes" FROM "mcp_oauth_grants" ORDER BY "id"`,
|
|
82
|
+
requests: await sql `SELECT "id", "scopes" FROM "mcp_oauth_requests" ORDER BY "id"`,
|
|
83
|
+
devices: await sql `SELECT "id", "scopes" FROM "mcp_oauth_device_requests" ORDER BY "id"`,
|
|
84
|
+
subscriptions: await sql `SELECT "id", "name" FROM "mcp_event_subscriptions" ORDER BY "id"`,
|
|
85
|
+
deliveries: await sql `SELECT "id", "event" FROM "mcp_event_deliveries" ORDER BY "id"`,
|
|
86
|
+
});
|
|
87
|
+
const before = await snapshot();
|
|
88
|
+
await sql `DELETE FROM "drizzle"."__drizzle_migrations" WHERE "hash" = ${hash}`;
|
|
89
|
+
await applyPendingMigrations(database.connectionString);
|
|
90
|
+
expect(await snapshot()).toEqual(before);
|
|
91
|
+
}, EMBEDDED_POSTGRES_TEST_TIMEOUT_MS);
|
|
92
|
+
});
|
|
93
|
+
//# sourceMappingURL=wardmote-mcp-scope-migration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-mcp-scope-migration.test.js","sourceRoot":"","sources":["../src/wardmote-mcp-scope-migration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wardmote-plugin-id-migration.test.d.ts","sourceRoot":"","sources":["../src/wardmote-plugin-id-migration.test.ts"],"names":[],"mappings":""}
|