@ykurilov/agent-chat-skills 0.107.1 → 0.107.2

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/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @ykurilov/agent-chat-skills
2
2
 
3
+ ## 0.107.2
4
+
5
+ ### Patch Changes
6
+
7
+ - 4430082: Хранилища SQLite и PostgreSQL собираются бандлером Next.js (Turbopack и webpack, `next dev`, `next build`, `output: "standalone"`) без `serverExternalPackages` и без настройки трассировки. Раньше сборка падала с «Module not found: Can't resolve '../drizzle'» (путь к папке миграций бандлер принимал за импорт), а standalone-сервер — с «Can't find meta/_journal.json» (папку миграций Next не копировал). Теперь миграции вшиты в код пакетов (`applyEmbeddedMigrations` и тип `EmbeddedMigration` в ядре), журнал и хеши миграций прежние: существующие базы ничего не применяют заново.
8
+ - Updated dependencies [4430082]
9
+ - @ykurilov/agent-chat-core@0.107.2
10
+
3
11
  ## 0.107.1
4
12
 
5
13
  ### Patch Changes
package/dist/postgres.js CHANGED
@@ -11,14 +11,10 @@ import {
11
11
  storedText
12
12
  } from "./chunk-X36FOCSA.js";
13
13
 
14
- // src/postgres.ts
15
- import { fileURLToPath } from "url";
16
-
17
14
  // src/store/postgres.ts
18
15
  import { and, count, desc, eq, getTableColumns } from "drizzle-orm";
19
16
  import { drizzle } from "drizzle-orm/node-postgres";
20
- import { migrate } from "drizzle-orm/node-postgres/migrator";
21
- import { migratePostgresSchema } from "@ykurilov/agent-chat-core";
17
+ import { migratePostgresSchema, applyEmbeddedMigrations } from "@ykurilov/agent-chat-core";
22
18
 
23
19
  // src/store/postgres-schema.ts
24
20
  import { bigserial, index, integer, pgSchema, primaryKey, text, timestamp } from "drizzle-orm/pg-core";
@@ -75,16 +71,16 @@ function toVersion(row) {
75
71
  function toLoad({ id: _id, ...row }) {
76
72
  return { ...row, loadedAt: row.loadedAt.toISOString() };
77
73
  }
78
- async function migrateSkillsToLatest(pool, migrationsFolder) {
74
+ async function migrateSkillsToLatest(pool, migrations2) {
79
75
  await migratePostgresSchema({
80
76
  connect: () => pool.connect(),
81
77
  lockKey: SKILLS_MIGRATION_LOCK_KEY,
82
- migrate: (client) => migrate(drizzle(client), { migrationsFolder, migrationsSchema: "agent_chat", migrationsTable: SKILLS_MIGRATIONS_TABLE })
78
+ migrate: async (client) => await applyEmbeddedMigrations(drizzle(client), migrations2, { migrationsSchema: "agent_chat", migrationsTable: SKILLS_MIGRATIONS_TABLE })
83
79
  });
84
80
  }
85
- function createPostgresSkillStore(pool, migrationsFolder) {
81
+ function createPostgresSkillStore(pool, migrations2) {
86
82
  const db = drizzle(pool);
87
- const ready = migrateSkillsToLatest(pool, migrationsFolder);
83
+ const ready = migrateSkillsToLatest(pool, migrations2);
88
84
  ready.catch(() => {
89
85
  });
90
86
  async function get(name) {
@@ -173,10 +169,20 @@ function createPostgresSkillStore(pool, migrationsFolder) {
173
169
  };
174
170
  }
175
171
 
172
+ // src/drizzle-migrations-postgres.generated.ts
173
+ var migrations = [
174
+ // 0000_init
175
+ { folderMillis: 1792011806586, hash: "843717f97687d8ccf0b3ecd676be0be1bd57e037b0e1119b97167c63c4a728ef", bps: true, sql: [
176
+ 'CREATE TABLE "agent_chat"."skill_loads" (\n "id" bigserial PRIMARY KEY NOT NULL,\n "name" text NOT NULL,\n "version" integer NOT NULL,\n "chat_id" text NOT NULL,\n "owner_id" text NOT NULL,\n "turn_id" text NOT NULL,\n "loaded_at" timestamp (3) with time zone NOT NULL\n);\n',
177
+ '\nCREATE TABLE "agent_chat"."skill_versions" (\n "name" text NOT NULL,\n "version" integer NOT NULL,\n "when_to_use" text NOT NULL,\n "body" text NOT NULL,\n "author" text NOT NULL,\n "created_at" timestamp (3) with time zone NOT NULL,\n CONSTRAINT "skill_versions_name_version_pk" PRIMARY KEY("name","version")\n);\n',
178
+ '\nCREATE TABLE "agent_chat"."skills" (\n "name" text PRIMARY KEY NOT NULL,\n "when_to_use" text NOT NULL,\n "body" text NOT NULL,\n "status" text NOT NULL,\n "version" integer NOT NULL,\n "created_by" text NOT NULL,\n "created_at" timestamp (3) with time zone NOT NULL,\n "updated_by" text NOT NULL,\n "updated_at" timestamp (3) with time zone NOT NULL\n);\n',
179
+ '\nCREATE INDEX "skill_loads_name_loaded_idx" ON "agent_chat"."skill_loads" USING btree ("name","loaded_at");'
180
+ ] }
181
+ ];
182
+
176
183
  // src/postgres.ts
177
- var MIGRATIONS_FOLDER = fileURLToPath(new URL("../drizzle/postgres", import.meta.url));
178
184
  function postgresSkillStore(pool) {
179
- return createPostgresSkillStore(pool, MIGRATIONS_FOLDER);
185
+ return createPostgresSkillStore(pool, migrations);
180
186
  }
181
187
  export {
182
188
  SKILLS_MIGRATIONS_TABLE,
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/postgres.ts","../src/store/postgres.ts","../src/store/postgres-schema.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\nimport type { Pool } from \"pg\";\nimport type { SkillStore } from \"./types\";\nimport { createPostgresSkillStore } from \"./store/postgres\";\n\nexport { SKILLS_MIGRATION_LOCK_KEY, SKILLS_MIGRATIONS_TABLE } from \"./store/migration-settings\";\nexport { skillLoads, skills, skillVersions } from \"./store/postgres-schema\";\n\n/** Миграции лежат в пакете рядом с `dist`: `drizzle/postgres`. */\nconst MIGRATIONS_FOLDER = fileURLToPath(new URL(\"../drizzle/postgres\", import.meta.url));\n\n/**\n * Навыки в PostgreSQL на пуле приложения (схема `agent_chat`, та же база, что у хранилища чатов).\n * Таблицы приводятся к последней миграции при первом обращении. Пул закрывает приложение.\n */\nexport function postgresSkillStore(pool: Pool): SkillStore {\n return createPostgresSkillStore(pool, MIGRATIONS_FOLDER);\n}\n","import { and, count, desc, eq, getTableColumns } from \"drizzle-orm\";\nimport { drizzle } from \"drizzle-orm/node-postgres\";\nimport { migrate } from \"drizzle-orm/node-postgres/migrator\";\nimport { migratePostgresSchema } from \"@ykurilov/agent-chat-core\";\nimport type { Pool } from \"pg\";\nimport { SkillExistsError, SkillNotFoundError, SkillVersionConflictError } from \"../types\";\nimport type { Skill, SkillBrief, SkillLoad, SkillStore, SkillVersion } from \"../types\";\nimport { SKILLS_MIGRATION_LOCK_KEY, SKILLS_MIGRATIONS_TABLE } from \"./migration-settings\";\nimport { skillLoads, skills, skillVersions } from \"./postgres-schema\";\nimport { byName, sameText, storedText } from \"./skill-store\";\n\nfunction toSkill(row: typeof skills.$inferSelect): Skill {\n return { ...row, createdAt: row.createdAt.toISOString(), updatedAt: row.updatedAt.toISOString() };\n}\n\nconst { body: _body, ...briefColumns } = getTableColumns(skills);\n\nfunction toBrief(row: Omit<typeof skills.$inferSelect, \"body\">): SkillBrief {\n return { ...row, createdAt: row.createdAt.toISOString(), updatedAt: row.updatedAt.toISOString() };\n}\n\nfunction toVersion(row: typeof skillVersions.$inferSelect): SkillVersion {\n return { ...row, createdAt: row.createdAt.toISOString() };\n}\n\nfunction toLoad({ id: _id, ...row }: typeof skillLoads.$inferSelect): SkillLoad {\n return { ...row, loadedAt: row.loadedAt.toISOString() };\n}\n\n/**\n * Приводит таблицы навыков к последней миграции. Схема `agent_chat` создаётся под общей блокировкой всех пакетов, миграции — под своей:\n * копии пакета ждут друг друга, а разные пакеты стартуют разом на пустой базе без гонки за схему.\n */\nexport async function migrateSkillsToLatest(pool: Pool, migrationsFolder: string): Promise<void> {\n await migratePostgresSchema({\n connect: () => pool.connect(),\n lockKey: SKILLS_MIGRATION_LOCK_KEY,\n migrate: (client) => migrate(drizzle(client), { migrationsFolder, migrationsSchema: \"agent_chat\", migrationsTable: SKILLS_MIGRATIONS_TABLE }),\n });\n}\n\n/**\n * Навыки в PostgreSQL (схема `agent_chat`) на пуле приложения. Миграция идёт при первом обращении, каждая операция\n * её дожидается. Правка и её версия — в одной транзакции с условием на номер версии. Пул закрывает приложение.\n */\nexport function createPostgresSkillStore(pool: Pool, migrationsFolder: string): SkillStore {\n const db = drizzle(pool);\n const ready = migrateSkillsToLatest(pool, migrationsFolder);\n // Ошибка миграции придёт в каждую операцию; без этого она всплыла бы ещё и как необработанная.\n ready.catch(() => {});\n\n async function get(name: string): Promise<Skill | null> {\n await ready;\n const [row] = await db.select().from(skills).where(eq(skills.name, name));\n return row ? toSkill(row) : null;\n }\n\n return {\n async list() {\n await ready;\n return (await db.select().from(skills)).map(toSkill).sort(byName);\n },\n async listBrief() {\n await ready;\n return (await db.select(briefColumns).from(skills)).map(toBrief).sort(byName);\n },\n get,\n async create(input, at) {\n await ready;\n const text = storedText(input);\n return db.transaction(async (tx) => {\n const [row] = await tx\n .insert(skills)\n .values({ name: input.name, ...text, status: input.status, version: 1, createdBy: input.author, createdAt: new Date(at), updatedBy: input.author, updatedAt: new Date(at) })\n .onConflictDoNothing()\n .returning();\n if (!row) throw new SkillExistsError(input.name);\n await tx.insert(skillVersions).values({ name: input.name, version: 1, ...text, author: input.author, createdAt: new Date(at) });\n return toSkill(row);\n });\n },\n async updateText(name, edit, at) {\n await ready;\n const text = storedText(edit);\n return db.transaction(async (tx) => {\n const [current] = await tx.select().from(skills).where(eq(skills.name, name));\n if (!current) throw new SkillNotFoundError(name);\n if (current.version !== edit.expectedVersion) throw new SkillVersionConflictError(name, current.version);\n if (sameText(toSkill(current), text)) return toSkill(current);\n const version = current.version + 1;\n // Условие на версию — в том же `update … where`: соперник, успевший первым, оставит здесь ноль строк.\n const [row] = await tx\n .update(skills)\n .set({ ...text, version, updatedBy: edit.author, updatedAt: new Date(at) })\n .where(and(eq(skills.name, name), eq(skills.version, edit.expectedVersion)))\n .returning();\n if (!row) {\n const [latest] = await db.select({ version: skills.version }).from(skills).where(eq(skills.name, name));\n if (!latest) throw new SkillNotFoundError(name);\n throw new SkillVersionConflictError(name, latest.version);\n }\n await tx.insert(skillVersions).values({ name, version, ...text, author: edit.author, createdAt: new Date(at) });\n return toSkill(row);\n });\n },\n async setStatus(name, status, author, at) {\n await ready;\n const [row] = await db.update(skills).set({ status, updatedBy: author, updatedAt: new Date(at) }).where(eq(skills.name, name)).returning();\n if (!row) throw new SkillNotFoundError(name);\n return toSkill(row);\n },\n async delete(name) {\n await ready;\n return db.transaction(async (tx) => {\n await tx.delete(skillLoads).where(eq(skillLoads.name, name));\n await tx.delete(skillVersions).where(eq(skillVersions.name, name));\n const removed = await tx.delete(skills).where(eq(skills.name, name)).returning({ name: skills.name });\n return removed.length > 0;\n });\n },\n async listVersions(name) {\n await ready;\n return (await db.select().from(skillVersions).where(eq(skillVersions.name, name)).orderBy(desc(skillVersions.version))).map(toVersion);\n },\n async getVersion(name, version) {\n await ready;\n const [row] = await db.select().from(skillVersions).where(and(eq(skillVersions.name, name), eq(skillVersions.version, version)));\n return row ? toVersion(row) : null;\n },\n async recordLoad(load) {\n await ready;\n await db.insert(skillLoads).values({ ...load, loadedAt: new Date(load.loadedAt) });\n },\n async loadStats(name, limit) {\n await ready;\n const [{ total } = { total: 0 }] = await db.select({ total: count() }).from(skillLoads).where(eq(skillLoads.name, name));\n const recent = await db.select().from(skillLoads).where(eq(skillLoads.name, name)).orderBy(desc(skillLoads.loadedAt), desc(skillLoads.id)).limit(limit);\n return { total, recent: recent.map(toLoad) };\n },\n async loadCounts() {\n await ready;\n const rows = await db.select({ name: skillLoads.name, total: count() }).from(skillLoads).groupBy(skillLoads.name);\n return Object.fromEntries(rows.map((row) => [row.name, row.total]));\n },\n };\n}\n","import { bigserial, index, integer, pgSchema, primaryKey, text, timestamp } from \"drizzle-orm/pg-core\";\nimport type { SkillStatus } from \"../types\";\n\n/** Та же схема базы, что у хранилища чатов: у приложения одна база и одна схема `agent_chat`. */\nconst agentChatSchema = pgSchema(\"agent_chat\");\n\nconst moment = (name: string) => timestamp(name, { mode: \"date\", precision: 3, withTimezone: true });\n\nexport const skills = agentChatSchema.table(\"skills\", {\n name: text(\"name\").primaryKey(),\n whenToUse: text(\"when_to_use\").notNull(),\n body: text(\"body\").notNull(),\n status: text(\"status\").$type<SkillStatus>().notNull(),\n version: integer(\"version\").notNull(),\n createdBy: text(\"created_by\").notNull(),\n createdAt: moment(\"created_at\").notNull(),\n updatedBy: text(\"updated_by\").notNull(),\n updatedAt: moment(\"updated_at\").notNull(),\n});\n\nexport const skillVersions = agentChatSchema.table(\n \"skill_versions\",\n {\n name: text(\"name\").notNull(),\n version: integer(\"version\").notNull(),\n whenToUse: text(\"when_to_use\").notNull(),\n body: text(\"body\").notNull(),\n author: text(\"author\").notNull(),\n createdAt: moment(\"created_at\").notNull(),\n },\n (table) => [primaryKey({ columns: [table.name, table.version] })],\n);\n\nexport const skillLoads = agentChatSchema.table(\n \"skill_loads\",\n {\n id: bigserial(\"id\", { mode: \"number\" }).primaryKey(),\n name: text(\"name\").notNull(),\n version: integer(\"version\").notNull(),\n chatId: text(\"chat_id\").notNull(),\n ownerId: text(\"owner_id\").notNull(),\n turnId: text(\"turn_id\").notNull(),\n loadedAt: moment(\"loaded_at\").notNull(),\n },\n (table) => [index(\"skill_loads_name_loaded_idx\").on(table.name, table.loadedAt)],\n);\n"],"mappings":"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","names":["text"]}
1
+ {"version":3,"sources":["../src/store/postgres.ts","../src/store/postgres-schema.ts","../src/drizzle-migrations-postgres.generated.ts","../src/postgres.ts"],"sourcesContent":["import { and, count, desc, eq, getTableColumns } from \"drizzle-orm\";\nimport { drizzle } from \"drizzle-orm/node-postgres\";\nimport { migratePostgresSchema, applyEmbeddedMigrations, type EmbeddedMigration } from \"@ykurilov/agent-chat-core\";\nimport type { Pool } from \"pg\";\nimport { SkillExistsError, SkillNotFoundError, SkillVersionConflictError } from \"../types\";\nimport type { Skill, SkillBrief, SkillLoad, SkillStore, SkillVersion } from \"../types\";\nimport { SKILLS_MIGRATION_LOCK_KEY, SKILLS_MIGRATIONS_TABLE } from \"./migration-settings\";\nimport { skillLoads, skills, skillVersions } from \"./postgres-schema\";\nimport { byName, sameText, storedText } from \"./skill-store\";\n\nfunction toSkill(row: typeof skills.$inferSelect): Skill {\n return { ...row, createdAt: row.createdAt.toISOString(), updatedAt: row.updatedAt.toISOString() };\n}\n\nconst { body: _body, ...briefColumns } = getTableColumns(skills);\n\nfunction toBrief(row: Omit<typeof skills.$inferSelect, \"body\">): SkillBrief {\n return { ...row, createdAt: row.createdAt.toISOString(), updatedAt: row.updatedAt.toISOString() };\n}\n\nfunction toVersion(row: typeof skillVersions.$inferSelect): SkillVersion {\n return { ...row, createdAt: row.createdAt.toISOString() };\n}\n\nfunction toLoad({ id: _id, ...row }: typeof skillLoads.$inferSelect): SkillLoad {\n return { ...row, loadedAt: row.loadedAt.toISOString() };\n}\n\n/**\n * Приводит таблицы навыков к последней миграции. Схема `agent_chat` создаётся под общей блокировкой всех пакетов, миграции — под своей:\n * копии пакета ждут друг друга, а разные пакеты стартуют разом на пустой базе без гонки за схему.\n */\nexport async function migrateSkillsToLatest(pool: Pool, migrations: readonly EmbeddedMigration[]): Promise<void> {\n await migratePostgresSchema({\n connect: () => pool.connect(),\n lockKey: SKILLS_MIGRATION_LOCK_KEY,\n migrate: async (client) => await applyEmbeddedMigrations(drizzle(client), migrations, { migrationsSchema: \"agent_chat\", migrationsTable: SKILLS_MIGRATIONS_TABLE }),\n });\n}\n\n/**\n * Навыки в PostgreSQL (схема `agent_chat`) на пуле приложения. Миграция идёт при первом обращении, каждая операция\n * её дожидается. Правка и её версия — в одной транзакции с условием на номер версии. Пул закрывает приложение.\n */\nexport function createPostgresSkillStore(pool: Pool, migrations: readonly EmbeddedMigration[]): SkillStore {\n const db = drizzle(pool);\n const ready = migrateSkillsToLatest(pool, migrations);\n // Ошибка миграции придёт в каждую операцию; без этого она всплыла бы ещё и как необработанная.\n ready.catch(() => {});\n\n async function get(name: string): Promise<Skill | null> {\n await ready;\n const [row] = await db.select().from(skills).where(eq(skills.name, name));\n return row ? toSkill(row) : null;\n }\n\n return {\n async list() {\n await ready;\n return (await db.select().from(skills)).map(toSkill).sort(byName);\n },\n async listBrief() {\n await ready;\n return (await db.select(briefColumns).from(skills)).map(toBrief).sort(byName);\n },\n get,\n async create(input, at) {\n await ready;\n const text = storedText(input);\n return db.transaction(async (tx) => {\n const [row] = await tx\n .insert(skills)\n .values({ name: input.name, ...text, status: input.status, version: 1, createdBy: input.author, createdAt: new Date(at), updatedBy: input.author, updatedAt: new Date(at) })\n .onConflictDoNothing()\n .returning();\n if (!row) throw new SkillExistsError(input.name);\n await tx.insert(skillVersions).values({ name: input.name, version: 1, ...text, author: input.author, createdAt: new Date(at) });\n return toSkill(row);\n });\n },\n async updateText(name, edit, at) {\n await ready;\n const text = storedText(edit);\n return db.transaction(async (tx) => {\n const [current] = await tx.select().from(skills).where(eq(skills.name, name));\n if (!current) throw new SkillNotFoundError(name);\n if (current.version !== edit.expectedVersion) throw new SkillVersionConflictError(name, current.version);\n if (sameText(toSkill(current), text)) return toSkill(current);\n const version = current.version + 1;\n // Условие на версию — в том же `update … where`: соперник, успевший первым, оставит здесь ноль строк.\n const [row] = await tx\n .update(skills)\n .set({ ...text, version, updatedBy: edit.author, updatedAt: new Date(at) })\n .where(and(eq(skills.name, name), eq(skills.version, edit.expectedVersion)))\n .returning();\n if (!row) {\n const [latest] = await db.select({ version: skills.version }).from(skills).where(eq(skills.name, name));\n if (!latest) throw new SkillNotFoundError(name);\n throw new SkillVersionConflictError(name, latest.version);\n }\n await tx.insert(skillVersions).values({ name, version, ...text, author: edit.author, createdAt: new Date(at) });\n return toSkill(row);\n });\n },\n async setStatus(name, status, author, at) {\n await ready;\n const [row] = await db.update(skills).set({ status, updatedBy: author, updatedAt: new Date(at) }).where(eq(skills.name, name)).returning();\n if (!row) throw new SkillNotFoundError(name);\n return toSkill(row);\n },\n async delete(name) {\n await ready;\n return db.transaction(async (tx) => {\n await tx.delete(skillLoads).where(eq(skillLoads.name, name));\n await tx.delete(skillVersions).where(eq(skillVersions.name, name));\n const removed = await tx.delete(skills).where(eq(skills.name, name)).returning({ name: skills.name });\n return removed.length > 0;\n });\n },\n async listVersions(name) {\n await ready;\n return (await db.select().from(skillVersions).where(eq(skillVersions.name, name)).orderBy(desc(skillVersions.version))).map(toVersion);\n },\n async getVersion(name, version) {\n await ready;\n const [row] = await db.select().from(skillVersions).where(and(eq(skillVersions.name, name), eq(skillVersions.version, version)));\n return row ? toVersion(row) : null;\n },\n async recordLoad(load) {\n await ready;\n await db.insert(skillLoads).values({ ...load, loadedAt: new Date(load.loadedAt) });\n },\n async loadStats(name, limit) {\n await ready;\n const [{ total } = { total: 0 }] = await db.select({ total: count() }).from(skillLoads).where(eq(skillLoads.name, name));\n const recent = await db.select().from(skillLoads).where(eq(skillLoads.name, name)).orderBy(desc(skillLoads.loadedAt), desc(skillLoads.id)).limit(limit);\n return { total, recent: recent.map(toLoad) };\n },\n async loadCounts() {\n await ready;\n const rows = await db.select({ name: skillLoads.name, total: count() }).from(skillLoads).groupBy(skillLoads.name);\n return Object.fromEntries(rows.map((row) => [row.name, row.total]));\n },\n };\n}\n","import { bigserial, index, integer, pgSchema, primaryKey, text, timestamp } from \"drizzle-orm/pg-core\";\nimport type { SkillStatus } from \"../types\";\n\n/** Та же схема базы, что у хранилища чатов: у приложения одна база и одна схема `agent_chat`. */\nconst agentChatSchema = pgSchema(\"agent_chat\");\n\nconst moment = (name: string) => timestamp(name, { mode: \"date\", precision: 3, withTimezone: true });\n\nexport const skills = agentChatSchema.table(\"skills\", {\n name: text(\"name\").primaryKey(),\n whenToUse: text(\"when_to_use\").notNull(),\n body: text(\"body\").notNull(),\n status: text(\"status\").$type<SkillStatus>().notNull(),\n version: integer(\"version\").notNull(),\n createdBy: text(\"created_by\").notNull(),\n createdAt: moment(\"created_at\").notNull(),\n updatedBy: text(\"updated_by\").notNull(),\n updatedAt: moment(\"updated_at\").notNull(),\n});\n\nexport const skillVersions = agentChatSchema.table(\n \"skill_versions\",\n {\n name: text(\"name\").notNull(),\n version: integer(\"version\").notNull(),\n whenToUse: text(\"when_to_use\").notNull(),\n body: text(\"body\").notNull(),\n author: text(\"author\").notNull(),\n createdAt: moment(\"created_at\").notNull(),\n },\n (table) => [primaryKey({ columns: [table.name, table.version] })],\n);\n\nexport const skillLoads = agentChatSchema.table(\n \"skill_loads\",\n {\n id: bigserial(\"id\", { mode: \"number\" }).primaryKey(),\n name: text(\"name\").notNull(),\n version: integer(\"version\").notNull(),\n chatId: text(\"chat_id\").notNull(),\n ownerId: text(\"owner_id\").notNull(),\n turnId: text(\"turn_id\").notNull(),\n loadedAt: moment(\"loaded_at\").notNull(),\n },\n (table) => [index(\"skill_loads_name_loaded_idx\").on(table.name, table.loadedAt)],\n);\n","// Создано scripts/embed-migrations.mjs из packages/skills/drizzle/postgres; не править руками: `pnpm db:generate` пакета пересоздаёт файл.\nimport type { EmbeddedMigration } from \"@ykurilov/agent-chat-core\";\n\nexport const migrations: readonly EmbeddedMigration[] = [\n // 0000_init\n { folderMillis: 1792011806586, hash: \"843717f97687d8ccf0b3ecd676be0be1bd57e037b0e1119b97167c63c4a728ef\", bps: true, sql: [\n \"CREATE TABLE \\\"agent_chat\\\".\\\"skill_loads\\\" (\\n\\t\\\"id\\\" bigserial PRIMARY KEY NOT NULL,\\n\\t\\\"name\\\" text NOT NULL,\\n\\t\\\"version\\\" integer NOT NULL,\\n\\t\\\"chat_id\\\" text NOT NULL,\\n\\t\\\"owner_id\\\" text NOT NULL,\\n\\t\\\"turn_id\\\" text NOT NULL,\\n\\t\\\"loaded_at\\\" timestamp (3) with time zone NOT NULL\\n);\\n\",\n \"\\nCREATE TABLE \\\"agent_chat\\\".\\\"skill_versions\\\" (\\n\\t\\\"name\\\" text NOT NULL,\\n\\t\\\"version\\\" integer NOT NULL,\\n\\t\\\"when_to_use\\\" text NOT NULL,\\n\\t\\\"body\\\" text NOT NULL,\\n\\t\\\"author\\\" text NOT NULL,\\n\\t\\\"created_at\\\" timestamp (3) with time zone NOT NULL,\\n\\tCONSTRAINT \\\"skill_versions_name_version_pk\\\" PRIMARY KEY(\\\"name\\\",\\\"version\\\")\\n);\\n\",\n \"\\nCREATE TABLE \\\"agent_chat\\\".\\\"skills\\\" (\\n\\t\\\"name\\\" text PRIMARY KEY NOT NULL,\\n\\t\\\"when_to_use\\\" text NOT NULL,\\n\\t\\\"body\\\" text NOT NULL,\\n\\t\\\"status\\\" text NOT NULL,\\n\\t\\\"version\\\" integer NOT NULL,\\n\\t\\\"created_by\\\" text NOT NULL,\\n\\t\\\"created_at\\\" timestamp (3) with time zone NOT NULL,\\n\\t\\\"updated_by\\\" text NOT NULL,\\n\\t\\\"updated_at\\\" timestamp (3) with time zone NOT NULL\\n);\\n\",\n \"\\nCREATE INDEX \\\"skill_loads_name_loaded_idx\\\" ON \\\"agent_chat\\\".\\\"skill_loads\\\" USING btree (\\\"name\\\",\\\"loaded_at\\\");\",\n ] },\n];\n","import type { Pool } from \"pg\";\nimport type { SkillStore } from \"./types\";\nimport { createPostgresSkillStore } from \"./store/postgres\";\nimport { migrations } from \"./drizzle-migrations-postgres.generated\";\n\nexport { SKILLS_MIGRATION_LOCK_KEY, SKILLS_MIGRATIONS_TABLE } from \"./store/migration-settings\";\nexport { skillLoads, skills, skillVersions } from \"./store/postgres-schema\";\n\n\n/**\n * Навыки в PostgreSQL на пуле приложения (схема `agent_chat`, та же база, что у хранилища чатов).\n * Таблицы приводятся к последней миграции при первом обращении. Пул закрывает приложение.\n */\nexport function postgresSkillStore(pool: Pool): SkillStore {\n return createPostgresSkillStore(pool, migrations);\n}\n"],"mappings":"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","names":["migrations","text"]}
package/dist/sqlite.js CHANGED
@@ -10,23 +10,18 @@ import {
10
10
  storedText
11
11
  } from "./chunk-X36FOCSA.js";
12
12
 
13
- // src/sqlite.ts
14
- import { fileURLToPath } from "url";
15
-
16
13
  // src/store/sqlite.ts
17
14
  import Database from "better-sqlite3";
18
15
  import { and, count, desc, eq, getTableColumns } from "drizzle-orm";
19
16
  import { drizzle } from "drizzle-orm/better-sqlite3";
20
17
 
21
18
  // src/store/sqlite-migrate.ts
22
- import { readMigrationFiles } from "drizzle-orm/migrator";
23
- function migrateUnderWriteLock(sqlite, migrationsFolder, migrationsTable) {
24
- const migrations = readMigrationFiles({ migrationsFolder, migrationsTable });
19
+ function migrateUnderWriteLock(sqlite, migrations2, migrationsTable) {
25
20
  sqlite.transaction(() => {
26
21
  sqlite.exec(`create table if not exists "${migrationsTable}" (id SERIAL PRIMARY KEY, hash text NOT NULL, created_at numeric)`);
27
22
  const last = sqlite.prepare(`select created_at from "${migrationsTable}" order by created_at desc limit 1`).get();
28
23
  const record = sqlite.prepare(`insert into "${migrationsTable}" (hash, created_at) values (?, ?)`);
29
- for (const migration of migrations) {
24
+ for (const migration of migrations2) {
30
25
  if (last !== void 0 && Number(last.created_at) >= migration.folderMillis) continue;
31
26
  for (const statement of migration.sql) if (statement.trim()) sqlite.exec(statement);
32
27
  record.run(migration.hash, migration.folderMillis);
@@ -89,12 +84,12 @@ function toVersion(row) {
89
84
  function toLoad({ id: _id, ...row }) {
90
85
  return { ...row, loadedAt: toIso(row.loadedAt) };
91
86
  }
92
- function createSqliteSkillStore(filePath, migrationsFolder) {
87
+ function createSqliteSkillStore(filePath, migrations2) {
93
88
  const sqlite = new Database(filePath);
94
89
  sqlite.pragma("busy_timeout = 5000");
95
90
  sqlite.pragma("journal_mode = WAL");
96
91
  const db = drizzle(sqlite);
97
- migrateUnderWriteLock(sqlite, migrationsFolder, SKILLS_MIGRATIONS_TABLE);
92
+ migrateUnderWriteLock(sqlite, migrations2, SKILLS_MIGRATIONS_TABLE);
98
93
  const read = (name) => db.select().from(skills).where(eq(skills.name, name)).get();
99
94
  const existing = (name) => {
100
95
  const row = read(name);
@@ -167,10 +162,20 @@ function createSqliteSkillStore(filePath, migrationsFolder) {
167
162
  };
168
163
  }
169
164
 
165
+ // src/drizzle-migrations-sqlite.generated.ts
166
+ var migrations = [
167
+ // 0000_init
168
+ { folderMillis: 1792011806048, hash: "6be69736d102594ecd9a8d504841c332243f98e517eb88371016c96f47d99c70", bps: true, sql: [
169
+ "CREATE TABLE `skill_loads` (\n `id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,\n `name` text NOT NULL,\n `version` integer NOT NULL,\n `chat_id` text NOT NULL,\n `owner_id` text NOT NULL,\n `turn_id` text NOT NULL,\n `loaded_at` integer NOT NULL\n);\n",
170
+ "\nCREATE INDEX `skill_loads_name_loaded_idx` ON `skill_loads` (`name`,`loaded_at`);",
171
+ "\nCREATE TABLE `skill_versions` (\n `name` text NOT NULL,\n `version` integer NOT NULL,\n `when_to_use` text NOT NULL,\n `body` text NOT NULL,\n `author` text NOT NULL,\n `created_at` integer NOT NULL,\n PRIMARY KEY(`name`, `version`)\n);\n",
172
+ "\nCREATE TABLE `skills` (\n `name` text PRIMARY KEY NOT NULL,\n `when_to_use` text NOT NULL,\n `body` text NOT NULL,\n `status` text NOT NULL,\n `version` integer NOT NULL,\n `created_by` text NOT NULL,\n `created_at` integer NOT NULL,\n `updated_by` text NOT NULL,\n `updated_at` integer NOT NULL\n);\n"
173
+ ] }
174
+ ];
175
+
170
176
  // src/sqlite.ts
171
- var MIGRATIONS_FOLDER = fileURLToPath(new URL("../drizzle/sqlite", import.meta.url));
172
177
  function sqliteSkillStore(filePath) {
173
- return createSqliteSkillStore(filePath, MIGRATIONS_FOLDER);
178
+ return createSqliteSkillStore(filePath, migrations);
174
179
  }
175
180
  export {
176
181
  SKILLS_MIGRATIONS_TABLE,
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/sqlite.ts","../src/store/sqlite.ts","../src/store/sqlite-migrate.ts","../src/store/sqlite-schema.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\nimport type { SkillStore } from \"./types\";\nimport { createSqliteSkillStore } from \"./store/sqlite\";\n\nexport { SKILLS_MIGRATIONS_TABLE } from \"./store/migration-settings\";\nexport { skillLoads, skills, skillVersions } from \"./store/sqlite-schema\";\n\n/** Миграции лежат в пакете рядом с `dist`: `drizzle/sqlite`. */\nconst MIGRATIONS_FOLDER = fileURLToPath(new URL(\"../drizzle/sqlite\", import.meta.url));\n\n/**\n * Навыки в файле SQLite; файл может быть общим с хранилищем чатов (`createSqliteChatStorage`).\n * Таблицы приводятся к последней миграции при открытии.\n */\nexport function sqliteSkillStore(filePath: string): SkillStore {\n return createSqliteSkillStore(filePath, MIGRATIONS_FOLDER);\n}\n","import Database from \"better-sqlite3\";\nimport { and, count, desc, eq, getTableColumns } from \"drizzle-orm\";\nimport { drizzle } from \"drizzle-orm/better-sqlite3\";\nimport { SkillExistsError, SkillNotFoundError, SkillVersionConflictError } from \"../types\";\nimport type { Skill, SkillBrief, SkillLoad, SkillStore, SkillVersion } from \"../types\";\nimport { SKILLS_MIGRATIONS_TABLE } from \"./migration-settings\";\nimport { migrateUnderWriteLock } from \"./sqlite-migrate\";\nimport { skillLoads, skills, skillVersions } from \"./sqlite-schema\";\nimport { byName, sameText, storedText } from \"./skill-store\";\n\nconst toMs = (iso: string) => Date.parse(iso);\nconst toIso = (ms: number) => new Date(ms).toISOString();\n\nfunction toSkill(row: typeof skills.$inferSelect): Skill {\n return { ...row, createdAt: toIso(row.createdAt), updatedAt: toIso(row.updatedAt) };\n}\n\nconst { body: _body, ...briefColumns } = getTableColumns(skills);\n\nfunction toBrief(row: Omit<typeof skills.$inferSelect, \"body\">): SkillBrief {\n return { ...row, createdAt: toIso(row.createdAt), updatedAt: toIso(row.updatedAt) };\n}\n\nfunction toVersion(row: typeof skillVersions.$inferSelect): SkillVersion {\n return { ...row, createdAt: toIso(row.createdAt) };\n}\n\nfunction toLoad({ id: _id, ...row }: typeof skillLoads.$inferSelect): SkillLoad {\n return { ...row, loadedAt: toIso(row.loadedAt) };\n}\n\n/**\n * Навыки в файле SQLite. Схема приводится к последней миграции при открытии; файл может быть общим с хранилищем\n * чатов. Правка и её версия — в одной транзакции.\n */\nexport function createSqliteSkillStore(filePath: string, migrationsFolder: string): SkillStore {\n const sqlite = new Database(filePath);\n // Ожидание замка — до первой записи: переход файла в WAL при старте двух копий тоже ждёт замок.\n sqlite.pragma(\"busy_timeout = 5000\");\n sqlite.pragma(\"journal_mode = WAL\");\n const db = drizzle(sqlite);\n migrateUnderWriteLock(sqlite, migrationsFolder, SKILLS_MIGRATIONS_TABLE);\n\n const read = (name: string) => db.select().from(skills).where(eq(skills.name, name)).get();\n const existing = (name: string) => {\n const row = read(name);\n if (!row) throw new SkillNotFoundError(name);\n return row;\n };\n\n return {\n async list() {\n return db.select().from(skills).all().map(toSkill).sort(byName);\n },\n async listBrief() {\n return db.select(briefColumns).from(skills).all().map(toBrief).sort(byName);\n },\n async get(name) {\n const row = read(name);\n return row ? toSkill(row) : null;\n },\n async create(input, at) {\n const text = storedText(input);\n return db.transaction((tx) => {\n const row = tx\n .insert(skills)\n .values({ name: input.name, ...text, status: input.status, version: 1, createdBy: input.author, createdAt: toMs(at), updatedBy: input.author, updatedAt: toMs(at) })\n .onConflictDoNothing()\n .returning()\n .get();\n if (!row) throw new SkillExistsError(input.name);\n tx.insert(skillVersions).values({ name: input.name, version: 1, ...text, author: input.author, createdAt: toMs(at) }).run();\n return toSkill(row);\n }, { behavior: \"immediate\" });\n },\n async updateText(name, edit, at) {\n const text = storedText(edit);\n return db.transaction((tx) => {\n const current = existing(name);\n if (current.version !== edit.expectedVersion) throw new SkillVersionConflictError(name, current.version);\n if (sameText(toSkill(current), text)) return toSkill(current);\n const version = current.version + 1;\n const row = tx\n .update(skills)\n .set({ ...text, version, updatedBy: edit.author, updatedAt: toMs(at) })\n .where(and(eq(skills.name, name), eq(skills.version, edit.expectedVersion)))\n .returning()\n .get()!;\n tx.insert(skillVersions).values({ name, version, ...text, author: edit.author, createdAt: toMs(at) }).run();\n return toSkill(row);\n }, { behavior: \"immediate\" });\n },\n async setStatus(name, status, author, at) {\n const row = db.update(skills).set({ status, updatedBy: author, updatedAt: toMs(at) }).where(eq(skills.name, name)).returning().get();\n if (!row) throw new SkillNotFoundError(name);\n return toSkill(row);\n },\n async delete(name) {\n return db.transaction((tx) => {\n tx.delete(skillLoads).where(eq(skillLoads.name, name)).run();\n tx.delete(skillVersions).where(eq(skillVersions.name, name)).run();\n return tx.delete(skills).where(eq(skills.name, name)).run().changes > 0;\n });\n },\n async listVersions(name) {\n return db.select().from(skillVersions).where(eq(skillVersions.name, name)).orderBy(desc(skillVersions.version)).all().map(toVersion);\n },\n async getVersion(name, version) {\n const row = db.select().from(skillVersions).where(and(eq(skillVersions.name, name), eq(skillVersions.version, version))).get();\n return row ? toVersion(row) : null;\n },\n async recordLoad(load) {\n db.insert(skillLoads).values({ ...load, loadedAt: toMs(load.loadedAt) }).run();\n },\n async loadStats(name, limit) {\n const total = db.select({ total: count() }).from(skillLoads).where(eq(skillLoads.name, name)).get()?.total ?? 0;\n const recent = db.select().from(skillLoads).where(eq(skillLoads.name, name)).orderBy(desc(skillLoads.loadedAt), desc(skillLoads.id)).limit(limit).all();\n return { total, recent: recent.map(toLoad) };\n },\n async loadCounts() {\n const rows = db.select({ name: skillLoads.name, total: count() }).from(skillLoads).groupBy(skillLoads.name).all();\n return Object.fromEntries(rows.map((row) => [row.name, row.total]));\n },\n };\n}\n","import type Database from \"better-sqlite3\";\nimport { readMigrationFiles } from \"drizzle-orm/migrator\";\n\n/**\n * Миграции drizzle, но журнал читается под замком записи, в одной транзакции с миграциями. drizzle читает журнал до своей\n * транзакции: вторая копия сервера на том же файле применила бы новую миграцию повторно и упала при запуске.\n * Порядок тот же, что у drizzle: применяются миграции новее последней записи журнала.\n */\nexport function migrateUnderWriteLock(sqlite: Database.Database, migrationsFolder: string, migrationsTable: string): void {\n const migrations = readMigrationFiles({ migrationsFolder, migrationsTable });\n sqlite\n .transaction(() => {\n sqlite.exec(`create table if not exists \"${migrationsTable}\" (id SERIAL PRIMARY KEY, hash text NOT NULL, created_at numeric)`);\n const last = sqlite.prepare(`select created_at from \"${migrationsTable}\" order by created_at desc limit 1`).get() as { created_at: number } | undefined;\n const record = sqlite.prepare(`insert into \"${migrationsTable}\" (hash, created_at) values (?, ?)`);\n for (const migration of migrations) {\n if (last !== undefined && Number(last.created_at) >= migration.folderMillis) continue;\n for (const statement of migration.sql) if (statement.trim()) sqlite.exec(statement);\n record.run(migration.hash, migration.folderMillis);\n }\n })\n .immediate();\n}\n","import { index, integer, primaryKey, sqliteTable, text } from \"drizzle-orm/sqlite-core\";\nimport type { SkillStatus } from \"../types\";\n\nexport const skills = sqliteTable(\"skills\", {\n name: text(\"name\").primaryKey(),\n whenToUse: text(\"when_to_use\").notNull(),\n body: text(\"body\").notNull(),\n status: text(\"status\").$type<SkillStatus>().notNull(),\n version: integer(\"version\").notNull(),\n createdBy: text(\"created_by\").notNull(),\n createdAt: integer(\"created_at\").notNull(),\n updatedBy: text(\"updated_by\").notNull(),\n updatedAt: integer(\"updated_at\").notNull(),\n});\n\nexport const skillVersions = sqliteTable(\n \"skill_versions\",\n {\n name: text(\"name\").notNull(),\n version: integer(\"version\").notNull(),\n whenToUse: text(\"when_to_use\").notNull(),\n body: text(\"body\").notNull(),\n author: text(\"author\").notNull(),\n createdAt: integer(\"created_at\").notNull(),\n },\n (table) => [primaryKey({ columns: [table.name, table.version] })],\n);\n\nexport const skillLoads = sqliteTable(\n \"skill_loads\",\n {\n id: integer(\"id\").primaryKey({ autoIncrement: true }),\n name: text(\"name\").notNull(),\n version: integer(\"version\").notNull(),\n chatId: text(\"chat_id\").notNull(),\n ownerId: text(\"owner_id\").notNull(),\n turnId: text(\"turn_id\").notNull(),\n loadedAt: integer(\"loaded_at\").notNull(),\n },\n (table) => [index(\"skill_loads_name_loaded_idx\").on(table.name, table.loadedAt)],\n);\n"],"mappings":"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","names":["text"]}
1
+ {"version":3,"sources":["../src/store/sqlite.ts","../src/store/sqlite-migrate.ts","../src/store/sqlite-schema.ts","../src/drizzle-migrations-sqlite.generated.ts","../src/sqlite.ts"],"sourcesContent":["import type { EmbeddedMigration } from \"@ykurilov/agent-chat-core\";\nimport Database from \"better-sqlite3\";\nimport { and, count, desc, eq, getTableColumns } from \"drizzle-orm\";\nimport { drizzle } from \"drizzle-orm/better-sqlite3\";\nimport { SkillExistsError, SkillNotFoundError, SkillVersionConflictError } from \"../types\";\nimport type { Skill, SkillBrief, SkillLoad, SkillStore, SkillVersion } from \"../types\";\nimport { SKILLS_MIGRATIONS_TABLE } from \"./migration-settings\";\nimport { migrateUnderWriteLock } from \"./sqlite-migrate\";\nimport { skillLoads, skills, skillVersions } from \"./sqlite-schema\";\nimport { byName, sameText, storedText } from \"./skill-store\";\n\nconst toMs = (iso: string) => Date.parse(iso);\nconst toIso = (ms: number) => new Date(ms).toISOString();\n\nfunction toSkill(row: typeof skills.$inferSelect): Skill {\n return { ...row, createdAt: toIso(row.createdAt), updatedAt: toIso(row.updatedAt) };\n}\n\nconst { body: _body, ...briefColumns } = getTableColumns(skills);\n\nfunction toBrief(row: Omit<typeof skills.$inferSelect, \"body\">): SkillBrief {\n return { ...row, createdAt: toIso(row.createdAt), updatedAt: toIso(row.updatedAt) };\n}\n\nfunction toVersion(row: typeof skillVersions.$inferSelect): SkillVersion {\n return { ...row, createdAt: toIso(row.createdAt) };\n}\n\nfunction toLoad({ id: _id, ...row }: typeof skillLoads.$inferSelect): SkillLoad {\n return { ...row, loadedAt: toIso(row.loadedAt) };\n}\n\n/**\n * Навыки в файле SQLite. Схема приводится к последней миграции при открытии; файл может быть общим с хранилищем\n * чатов. Правка и её версия — в одной транзакции.\n */\nexport function createSqliteSkillStore(filePath: string, migrations: readonly EmbeddedMigration[]): SkillStore {\n const sqlite = new Database(filePath);\n // Ожидание замка — до первой записи: переход файла в WAL при старте двух копий тоже ждёт замок.\n sqlite.pragma(\"busy_timeout = 5000\");\n sqlite.pragma(\"journal_mode = WAL\");\n const db = drizzle(sqlite);\n migrateUnderWriteLock(sqlite, migrations, SKILLS_MIGRATIONS_TABLE);\n\n const read = (name: string) => db.select().from(skills).where(eq(skills.name, name)).get();\n const existing = (name: string) => {\n const row = read(name);\n if (!row) throw new SkillNotFoundError(name);\n return row;\n };\n\n return {\n async list() {\n return db.select().from(skills).all().map(toSkill).sort(byName);\n },\n async listBrief() {\n return db.select(briefColumns).from(skills).all().map(toBrief).sort(byName);\n },\n async get(name) {\n const row = read(name);\n return row ? toSkill(row) : null;\n },\n async create(input, at) {\n const text = storedText(input);\n return db.transaction((tx) => {\n const row = tx\n .insert(skills)\n .values({ name: input.name, ...text, status: input.status, version: 1, createdBy: input.author, createdAt: toMs(at), updatedBy: input.author, updatedAt: toMs(at) })\n .onConflictDoNothing()\n .returning()\n .get();\n if (!row) throw new SkillExistsError(input.name);\n tx.insert(skillVersions).values({ name: input.name, version: 1, ...text, author: input.author, createdAt: toMs(at) }).run();\n return toSkill(row);\n }, { behavior: \"immediate\" });\n },\n async updateText(name, edit, at) {\n const text = storedText(edit);\n return db.transaction((tx) => {\n const current = existing(name);\n if (current.version !== edit.expectedVersion) throw new SkillVersionConflictError(name, current.version);\n if (sameText(toSkill(current), text)) return toSkill(current);\n const version = current.version + 1;\n const row = tx\n .update(skills)\n .set({ ...text, version, updatedBy: edit.author, updatedAt: toMs(at) })\n .where(and(eq(skills.name, name), eq(skills.version, edit.expectedVersion)))\n .returning()\n .get()!;\n tx.insert(skillVersions).values({ name, version, ...text, author: edit.author, createdAt: toMs(at) }).run();\n return toSkill(row);\n }, { behavior: \"immediate\" });\n },\n async setStatus(name, status, author, at) {\n const row = db.update(skills).set({ status, updatedBy: author, updatedAt: toMs(at) }).where(eq(skills.name, name)).returning().get();\n if (!row) throw new SkillNotFoundError(name);\n return toSkill(row);\n },\n async delete(name) {\n return db.transaction((tx) => {\n tx.delete(skillLoads).where(eq(skillLoads.name, name)).run();\n tx.delete(skillVersions).where(eq(skillVersions.name, name)).run();\n return tx.delete(skills).where(eq(skills.name, name)).run().changes > 0;\n });\n },\n async listVersions(name) {\n return db.select().from(skillVersions).where(eq(skillVersions.name, name)).orderBy(desc(skillVersions.version)).all().map(toVersion);\n },\n async getVersion(name, version) {\n const row = db.select().from(skillVersions).where(and(eq(skillVersions.name, name), eq(skillVersions.version, version))).get();\n return row ? toVersion(row) : null;\n },\n async recordLoad(load) {\n db.insert(skillLoads).values({ ...load, loadedAt: toMs(load.loadedAt) }).run();\n },\n async loadStats(name, limit) {\n const total = db.select({ total: count() }).from(skillLoads).where(eq(skillLoads.name, name)).get()?.total ?? 0;\n const recent = db.select().from(skillLoads).where(eq(skillLoads.name, name)).orderBy(desc(skillLoads.loadedAt), desc(skillLoads.id)).limit(limit).all();\n return { total, recent: recent.map(toLoad) };\n },\n async loadCounts() {\n const rows = db.select({ name: skillLoads.name, total: count() }).from(skillLoads).groupBy(skillLoads.name).all();\n return Object.fromEntries(rows.map((row) => [row.name, row.total]));\n },\n };\n}\n","import type { EmbeddedMigration } from \"@ykurilov/agent-chat-core\";\nimport type Database from \"better-sqlite3\";\n\n/**\n * Миграции drizzle, но журнал читается под замком записи, в одной транзакции с миграциями. drizzle читает журнал до своей\n * транзакции: вторая копия сервера на том же файле применила бы новую миграцию повторно и упала при запуске.\n * Порядок тот же, что у drizzle: применяются миграции новее последней записи журнала.\n */\nexport function migrateUnderWriteLock(sqlite: Database.Database, migrations: readonly EmbeddedMigration[], migrationsTable: string): void {\n sqlite\n .transaction(() => {\n sqlite.exec(`create table if not exists \"${migrationsTable}\" (id SERIAL PRIMARY KEY, hash text NOT NULL, created_at numeric)`);\n const last = sqlite.prepare(`select created_at from \"${migrationsTable}\" order by created_at desc limit 1`).get() as { created_at: number } | undefined;\n const record = sqlite.prepare(`insert into \"${migrationsTable}\" (hash, created_at) values (?, ?)`);\n for (const migration of migrations) {\n if (last !== undefined && Number(last.created_at) >= migration.folderMillis) continue;\n for (const statement of migration.sql) if (statement.trim()) sqlite.exec(statement);\n record.run(migration.hash, migration.folderMillis);\n }\n })\n .immediate();\n}\n","import { index, integer, primaryKey, sqliteTable, text } from \"drizzle-orm/sqlite-core\";\nimport type { SkillStatus } from \"../types\";\n\nexport const skills = sqliteTable(\"skills\", {\n name: text(\"name\").primaryKey(),\n whenToUse: text(\"when_to_use\").notNull(),\n body: text(\"body\").notNull(),\n status: text(\"status\").$type<SkillStatus>().notNull(),\n version: integer(\"version\").notNull(),\n createdBy: text(\"created_by\").notNull(),\n createdAt: integer(\"created_at\").notNull(),\n updatedBy: text(\"updated_by\").notNull(),\n updatedAt: integer(\"updated_at\").notNull(),\n});\n\nexport const skillVersions = sqliteTable(\n \"skill_versions\",\n {\n name: text(\"name\").notNull(),\n version: integer(\"version\").notNull(),\n whenToUse: text(\"when_to_use\").notNull(),\n body: text(\"body\").notNull(),\n author: text(\"author\").notNull(),\n createdAt: integer(\"created_at\").notNull(),\n },\n (table) => [primaryKey({ columns: [table.name, table.version] })],\n);\n\nexport const skillLoads = sqliteTable(\n \"skill_loads\",\n {\n id: integer(\"id\").primaryKey({ autoIncrement: true }),\n name: text(\"name\").notNull(),\n version: integer(\"version\").notNull(),\n chatId: text(\"chat_id\").notNull(),\n ownerId: text(\"owner_id\").notNull(),\n turnId: text(\"turn_id\").notNull(),\n loadedAt: integer(\"loaded_at\").notNull(),\n },\n (table) => [index(\"skill_loads_name_loaded_idx\").on(table.name, table.loadedAt)],\n);\n","// Создано scripts/embed-migrations.mjs из packages/skills/drizzle/sqlite; не править руками: `pnpm db:generate` пакета пересоздаёт файл.\nimport type { EmbeddedMigration } from \"@ykurilov/agent-chat-core\";\n\nexport const migrations: readonly EmbeddedMigration[] = [\n // 0000_init\n { folderMillis: 1792011806048, hash: \"6be69736d102594ecd9a8d504841c332243f98e517eb88371016c96f47d99c70\", bps: true, sql: [\n \"CREATE TABLE `skill_loads` (\\n\\t`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,\\n\\t`name` text NOT NULL,\\n\\t`version` integer NOT NULL,\\n\\t`chat_id` text NOT NULL,\\n\\t`owner_id` text NOT NULL,\\n\\t`turn_id` text NOT NULL,\\n\\t`loaded_at` integer NOT NULL\\n);\\n\",\n \"\\nCREATE INDEX `skill_loads_name_loaded_idx` ON `skill_loads` (`name`,`loaded_at`);\",\n \"\\nCREATE TABLE `skill_versions` (\\n\\t`name` text NOT NULL,\\n\\t`version` integer NOT NULL,\\n\\t`when_to_use` text NOT NULL,\\n\\t`body` text NOT NULL,\\n\\t`author` text NOT NULL,\\n\\t`created_at` integer NOT NULL,\\n\\tPRIMARY KEY(`name`, `version`)\\n);\\n\",\n \"\\nCREATE TABLE `skills` (\\n\\t`name` text PRIMARY KEY NOT NULL,\\n\\t`when_to_use` text NOT NULL,\\n\\t`body` text NOT NULL,\\n\\t`status` text NOT NULL,\\n\\t`version` integer NOT NULL,\\n\\t`created_by` text NOT NULL,\\n\\t`created_at` integer NOT NULL,\\n\\t`updated_by` text NOT NULL,\\n\\t`updated_at` integer NOT NULL\\n);\\n\",\n ] },\n];\n","import type { SkillStore } from \"./types\";\nimport { createSqliteSkillStore } from \"./store/sqlite\";\nimport { migrations } from \"./drizzle-migrations-sqlite.generated\";\n\nexport { SKILLS_MIGRATIONS_TABLE } from \"./store/migration-settings\";\nexport { skillLoads, skills, skillVersions } from \"./store/sqlite-schema\";\n\n\n/**\n * Навыки в файле SQLite; файл может быть общим с хранилищем чатов (`createSqliteChatStorage`).\n * Таблицы приводятся к последней миграции при открытии.\n */\nexport function sqliteSkillStore(filePath: string): SkillStore {\n return createSqliteSkillStore(filePath, migrations);\n}\n"],"mappings":"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","names":["migrations","migrations","text"]}
@@ -0,0 +1,2 @@
1
+ import type { EmbeddedMigration } from "@ykurilov/agent-chat-core";
2
+ export declare const migrations: readonly EmbeddedMigration[];
@@ -0,0 +1,2 @@
1
+ import type { EmbeddedMigration } from "@ykurilov/agent-chat-core";
2
+ export declare const migrations: readonly EmbeddedMigration[];
@@ -1,12 +1,13 @@
1
+ import { type EmbeddedMigration } from "@ykurilov/agent-chat-core";
1
2
  import type { Pool } from "pg";
2
3
  import type { SkillStore } from "../types.js";
3
4
  /**
4
5
  * Приводит таблицы навыков к последней миграции. Схема `agent_chat` создаётся под общей блокировкой всех пакетов, миграции — под своей:
5
6
  * копии пакета ждут друг друга, а разные пакеты стартуют разом на пустой базе без гонки за схему.
6
7
  */
7
- export declare function migrateSkillsToLatest(pool: Pool, migrationsFolder: string): Promise<void>;
8
+ export declare function migrateSkillsToLatest(pool: Pool, migrations: readonly EmbeddedMigration[]): Promise<void>;
8
9
  /**
9
10
  * Навыки в PostgreSQL (схема `agent_chat`) на пуле приложения. Миграция идёт при первом обращении, каждая операция
10
11
  * её дожидается. Правка и её версия — в одной транзакции с условием на номер версии. Пул закрывает приложение.
11
12
  */
12
- export declare function createPostgresSkillStore(pool: Pool, migrationsFolder: string): SkillStore;
13
+ export declare function createPostgresSkillStore(pool: Pool, migrations: readonly EmbeddedMigration[]): SkillStore;
@@ -1,7 +1,8 @@
1
+ import type { EmbeddedMigration } from "@ykurilov/agent-chat-core";
1
2
  import type Database from "better-sqlite3";
2
3
  /**
3
4
  * Миграции drizzle, но журнал читается под замком записи, в одной транзакции с миграциями. drizzle читает журнал до своей
4
5
  * транзакции: вторая копия сервера на том же файле применила бы новую миграцию повторно и упала при запуске.
5
6
  * Порядок тот же, что у drizzle: применяются миграции новее последней записи журнала.
6
7
  */
7
- export declare function migrateUnderWriteLock(sqlite: Database.Database, migrationsFolder: string, migrationsTable: string): void;
8
+ export declare function migrateUnderWriteLock(sqlite: Database.Database, migrations: readonly EmbeddedMigration[], migrationsTable: string): void;
@@ -1,6 +1,7 @@
1
+ import type { EmbeddedMigration } from "@ykurilov/agent-chat-core";
1
2
  import type { SkillStore } from "../types.js";
2
3
  /**
3
4
  * Навыки в файле SQLite. Схема приводится к последней миграции при открытии; файл может быть общим с хранилищем
4
5
  * чатов. Правка и её версия — в одной транзакции.
5
6
  */
6
- export declare function createSqliteSkillStore(filePath: string, migrationsFolder: string): SkillStore;
7
+ export declare function createSqliteSkillStore(filePath: string, migrations: readonly EmbeddedMigration[]): SkillStore;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ykurilov/agent-chat-skills",
3
- "version": "0.107.1",
3
+ "version": "0.107.2",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "sideEffects": false,
@@ -53,7 +53,7 @@
53
53
  "ai": "7.0.122",
54
54
  "drizzle-orm": "^0.45.3",
55
55
  "zod": "^4.6.5",
56
- "@ykurilov/agent-chat-core": "0.107.1"
56
+ "@ykurilov/agent-chat-core": "0.107.2"
57
57
  },
58
58
  "peerDependencies": {
59
59
  "better-sqlite3": "^13.0.3",
@@ -86,6 +86,6 @@
86
86
  "scripts": {
87
87
  "build": "node ../../scripts/build-package.mjs",
88
88
  "typecheck": "tsc -p tsconfig.json",
89
- "db:generate": "drizzle-kit generate --config drizzle.config.sqlite.ts && drizzle-kit generate --config drizzle.config.postgres.ts"
89
+ "db:generate": "drizzle-kit generate --config drizzle.config.sqlite.ts && drizzle-kit generate --config drizzle.config.postgres.ts && node ../../scripts/embed-migrations.mjs"
90
90
  }
91
91
  }