@ct-agents/prompts 0.1.8 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ct-agents/prompts",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "type": "module",
   "files": [
     "src"
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "zod": "4.4.3",
-    "@ct-agents/protocol": "0.1.8",
-    "@ct-agents/store": "0.1.8"
+    "@ct-agents/protocol": "0.2.0",
+    "@ct-agents/store": "0.2.0"
   },
   "publishConfig": {
     "access": "public"

package/src/index.ts

@@ -1,5 +1,3 @@
-import { randomUUID } from 'node:crypto';
-import type { SqlPool } from '@ct-agents/store';
 import type {
   AssemblePromptInput,
   CreatePromptFragmentInput,
@@ -8,255 +6,9 @@ import type {
   PromptFragmentView,
   PromptGenerator,
   PromptRegistry,
-  ResourceSlots,
   UpdatePromptFragmentInput,
 } from '@ct-agents/protocol';
 
-type PromptFragmentRow = {
-  app_id?: string | null;
-  id: string;
-  version: number;
-  name: string;
-  description?: string | null;
-  content: string;
-  enabled: boolean;
-  created_at?: string | Date | null;
-  updated_at?: string | Date | null;
-};
-
-function assertFragmentContent(name: string, content: string) {
-  if (!name.trim()) {
-    throw new Error('name 为必填');
-  }
-  if (!content.trim()) {
-    throw new Error('content 为必填');
-  }
-}
-
-function toIsoString(value: string | Date | null | undefined) {
-  if (!value) {
-    return undefined;
-  }
-
-  return value instanceof Date ? value.toISOString() : value;
-}
-
-function mapPromptFragmentRow(row: PromptFragmentRow): PromptFragmentView {
-  return {
-    appId: row.app_id ?? null,
-    id: row.id,
-    version: row.version,
-    name: row.name,
-    ...(row.description?.trim() ? { description: row.description.trim() } : {}),
-    content: row.content,
-    enabled: row.enabled,
-    source: {
-      kind: 'persisted',
-    },
-    createdAt: toIsoString(row.created_at),
-    updatedAt: toIsoString(row.updated_at),
-  };
-}
-
-export type PostgresPromptFragmentStoreOptions = {
-  createId?: () => string;
-};
-
-export class PostgresPromptFragmentStore implements PromptFragmentStore {
-  private readonly createId: () => string;
-
-  constructor(
-    private readonly pool: SqlPool,
-    options: PostgresPromptFragmentStoreOptions = {},
-  ) {
-    this.createId = options.createId ?? (() => `persisted:${randomUUID()}`);
-  }
-
-  async list(query?: { appId?: string; includeGlobal?: boolean }) {
-    const client = await this.pool.connect();
-
-    try {
-      const conditions = ['enabled = true'];
-      const params: unknown[] = [];
-      if (query?.appId) {
-        params.push(query.appId);
-        conditions.push(query.includeGlobal ? '(app_id = $1 or app_id is null)' : 'app_id = $1');
-      }
-      const result = await client.query<PromptFragmentRow>(
-        `
-          select
-            app_id,
-            id,
-            version,
-            name,
-            description,
-            content,
-            enabled,
-            created_at,
-            updated_at
-          from agent.agent_prompt_fragments
-          where ${conditions.join(' and ')}
-          order by updated_at desc, id desc
-        `,
-        params,
-      );
-
-      return result.rows.map(mapPromptFragmentRow);
-    } finally {
-      client.release();
-    }
-  }
-
-  async get(id: string) {
-    const client = await this.pool.connect();
-
-    try {
-      const result = await client.query<PromptFragmentRow>(
-        `
-          select
-            app_id,
-            id,
-            version,
-            name,
-            description,
-            content,
-            enabled,
-            created_at,
-            updated_at
-          from agent.agent_prompt_fragments
-          where id = $1
-          limit 1
-        `,
-        [id],
-      );
-
-      return result.rows[0] ? mapPromptFragmentRow(result.rows[0]) : null;
-    } finally {
-      client.release();
-    }
-  }
-
-  async create(input: CreatePromptFragmentInput) {
-    assertFragmentContent(input.name, input.content);
-    const client = await this.pool.connect();
-
-    try {
-      const result = await client.query<PromptFragmentRow>(
-        `
-          insert into agent.agent_prompt_fragments (
-            app_id,
-            id,
-            name,
-            description,
-            content,
-            enabled
-          )
-          values ($1, $2, $3, $4, $5, $6)
-          returning
-            app_id,
-            id,
-            version,
-            name,
-            description,
-            content,
-            enabled,
-            created_at,
-            updated_at
-        `,
-        [
-          input.appId ?? null,
-          this.createId(),
-          input.name.trim(),
-          input.description?.trim() || null,
-          input.content.trim(),
-          input.enabled ?? true,
-        ],
-      );
-
-      return mapPromptFragmentRow(result.rows[0]);
-    } finally {
-      client.release();
-    }
-  }
-
-  async update(input: UpdatePromptFragmentInput) {
-    const current = await this.get(input.id);
-    if (!current) {
-      throw new Error(`Prompt fragment not found: ${input.id}`);
-    }
-
-    const name = input.name === undefined ? current.name : input.name.trim();
-    const description = input.description === undefined
-      ? current.description ?? null
-      : (input.description.trim() || null);
-    const content = input.content === undefined ? current.content : input.content.trim();
-    assertFragmentContent(name, content);
-    const client = await this.pool.connect();
-
-    try {
-      const result = await client.query<PromptFragmentRow>(
-        `
-          update agent.agent_prompt_fragments
-          set
-            name = $2,
-            description = $3,
-            content = $4,
-            enabled = $5,
-            version = version + 1,
-            updated_at = now()
-          where id = $1 and version = $6
-          returning
-            app_id,
-            id,
-            version,
-            name,
-            description,
-            content,
-            enabled,
-            created_at,
-            updated_at
-        `,
-        [
-          input.id,
-          name,
-          description,
-          content,
-          input.enabled ?? current.enabled,
-          input.baseVersion,
-        ],
-      );
-
-      if (!result.rows[0]) {
-        throw new Error(`VERSION_CONFLICT: Prompt fragment has changed: ${input.id}`);
-      }
-
-      return mapPromptFragmentRow(result.rows[0]);
-    } finally {
-      client.release();
-    }
-  }
-
-  async delete(id: string) {
-    const client = await this.pool.connect();
-
-    try {
-      await client.query(
-        `
-          update agent.agent_prompt_fragments
-          set
-            enabled = false,
-            version = version + 1,
-            updated_at = now()
-          where id = $1
-        `,
-        [id],
-      );
-    } finally {
-      client.release();
-    }
-  }
-}
-
 export type DefaultPromptRegistryDependencies = {
   store: PromptFragmentStore;
   generators?: GeneratorRegistry;
@@ -451,9 +203,7 @@ export class DefaultPromptRegistry implements PromptRegistry {
   }
 
   async assemblePrompt(input: AssemblePromptInput) {
-    const persisted = await this.dependencies.store.list(input.appId
-      ? { appId: input.appId, includeGlobal: true }
-      : undefined);
+    const persisted = await this.dependencies.store.list();
     const byId = new Map<string, PromptFragmentView>(
       persisted.map((fragment) => [`fragment:${fragment.id}`, fragment]),
     );
@@ -501,13 +251,10 @@ export class DefaultPromptRegistry implements PromptRegistry {
       .join('\n--------------\n');
   }
 
-  async hasPromptReference(input: { appId?: string; id: string }) {
+  async hasPromptReference(input: { id: string }) {
     if (input.id.startsWith('fragment:')) {
       const fragment = await this.dependencies.store.get(input.id.slice('fragment:'.length));
-      return Boolean(
-        fragment?.enabled
-        && (!input.appId || fragment.appId === input.appId || fragment.appId === null),
-      );
+      return Boolean(fragment?.enabled);
     }
     if (input.id.startsWith('generator:')) {
       return Boolean(this.generators.get(input.id.slice('generator:'.length)));
@@ -515,8 +262,8 @@ export class DefaultPromptRegistry implements PromptRegistry {
     return false;
   }
 
-  async listPromptFragments(query?: Parameters<PromptFragmentStore['list']>[0]) {
-    const persisted = await this.dependencies.store.list(query);
+  async listPromptFragments() {
+    const persisted = await this.dependencies.store.list();
     return [...persisted];
   }
 
@@ -542,5 +289,4 @@ export function createDefaultPromptRegistry(dependencies: DefaultPromptRegistryD
   return new DefaultPromptRegistry(dependencies);
 }
 
-export { PostgresSkillStore } from './postgres-skill-store.js';
 export * from './load-skill.js';

package/src/load-skill.ts

@@ -111,26 +111,6 @@ const loadSkillDescriptor: ToolDescriptor = {
       },
     },
   },
-  resultSchema: {
-    type: 'object',
-    additionalProperties: false,
-    required: ['status'],
-    properties: {
-      status: { enum: ['ok', 'warning'] },
-      message: { type: 'string' },
-      skill: {
-        type: 'object',
-        additionalProperties: false,
-        required: ['name', 'description', 'instructions', 'version'],
-        properties: {
-          name: { type: 'string' },
-          description: { type: 'string' },
-          instructions: { type: 'string' },
-          version: { type: 'integer' },
-        },
-      },
-    },
-  },
   annotations: {
     readOnly: true,
     idempotent: true,
@@ -182,7 +162,6 @@ export function createLoadSkillToolHandler(_deps: LoadSkillToolDeps = {}): ToolH
       }
     },
     inputSchema: loadSkillToolInputSchema,
-    resultSchema: loadSkillToolResultSchema,
     async execute(input, context) {
       const skills = context.resources.skills;
       if (!skills) {

package/src/testing.ts

@@ -4,8 +4,6 @@ import type {
   CreateSkillInput,
   PromptFragmentStore,
   PromptFragmentView,
-  SkillKey,
-  SkillListQuery,
   SkillStore,
   SkillView,
   UpdateSkillInput,
@@ -19,17 +17,9 @@ import {
 export class InMemoryPromptFragmentStore implements PromptFragmentStore {
   private readonly fragments = new Map<string, PromptFragmentView>();
 
-  async list(query?: { appId?: string; includeGlobal?: boolean }) {
+  async list() {
     return Array.from(this.fragments.values())
       .filter((fragment) => fragment.enabled)
-      .filter((fragment) => {
-        if (!query?.appId) {
-          return true;
-        }
-        return query.includeGlobal
-          ? fragment.appId === query.appId || fragment.appId === null
-          : fragment.appId === query.appId;
-      })
       .map((fragment) => structuredClone(fragment))
       .sort((left, right) => (right.updatedAt ?? '').localeCompare(left.updatedAt ?? ''));
   }
@@ -42,7 +32,6 @@ export class InMemoryPromptFragmentStore implements PromptFragmentStore {
   async create(input: CreatePromptFragmentInput) {
     const now = new Date().toISOString();
     const fragment: PromptFragmentView = {
-      appId: input.appId ?? null,
       id: `persisted:${randomUUID()}`,
       version: 1,
       name: input.name.trim(),
@@ -103,45 +92,20 @@ export class InMemoryPromptFragmentStore implements PromptFragmentStore {
 export class InMemorySkillStore implements SkillStore {
   private readonly skills = new Map<string, SkillView>();
 
-  private key(appId: string | null | undefined, name: string) {
-    return JSON.stringify([appId ?? null, name]);
-  }
-
-  async list(query?: SkillListQuery) {
-    const filtered = Array.from(this.skills.values())
+  async list() {
+    return Array.from(this.skills.values())
       .filter((skill) => skill.enabled)
-      .filter((skill) => {
-        if (query?.appId === null) {
-          return skill.appId === null;
-        }
-        if (!query?.appId) {
-          return true;
-        }
-        return query.includeGlobal
-          ? skill.appId === query.appId || skill.appId === null
-          : skill.appId === query.appId;
-      });
-    const resolved = query?.resolution === 'effective' && query.appId !== undefined
-      ? Array.from(filtered.reduce((byName, skill) => {
-          const current = byName.get(skill.name);
-          if (!current || (current.appId === null && skill.appId !== null)) {
-            byName.set(skill.name, skill);
-          }
-          return byName;
-        }, new Map<string, SkillView>()).values())
-      : filtered;
-    return resolved.map((skill) => structuredClone(skill));
+      .map((skill) => structuredClone(skill));
   }
 
-  async get(input: SkillKey) {
-    const skill = this.skills.get(this.key(input.appId, input.name));
+  async get(name: string) {
+    const skill = this.skills.get(name);
     return skill ? structuredClone(skill) : null;
   }
 
   async create(input: CreateSkillInput) {
     const now = new Date().toISOString();
     const skill: SkillView = {
-      appId: input.appId ?? null,
       name: input.name.trim(),
       version: 1,
       description: input.description.trim(),
@@ -150,7 +114,7 @@ export class InMemorySkillStore implements SkillStore {
       createdAt: now,
       updatedAt: now,
     };
-    const key = this.key(skill.appId, skill.name);
+    const key = skill.name;
     if (this.skills.has(key)) {
       throw new Error(`SKILL_ALREADY_EXISTS: ${skill.name}`);
     }
@@ -159,7 +123,7 @@ export class InMemorySkillStore implements SkillStore {
   }
 
   async update(input: UpdateSkillInput) {
-    const key = this.key(input.appId, input.name);
+    const key = input.name;
     const current = this.skills.get(key);
     if (!current) {
       throw new Error(`Skill not found: ${input.name}`);
@@ -180,13 +144,12 @@ export class InMemorySkillStore implements SkillStore {
     return structuredClone(next);
   }
 
-  async delete(input: SkillKey) {
-    const key = this.key(input.appId, input.name);
-    const current = this.skills.get(key);
+  async delete(name: string) {
+    const current = this.skills.get(name);
     if (!current) {
       return;
     }
-    this.skills.set(key, {
+    this.skills.set(name, {
       ...current,
       version: current.version + 1,
       enabled: false,

package/src/postgres-skill-store.ts

@@ -1,176 +0,0 @@
-import type { SqlPool } from '@ct-agents/store';
-import type {
-  CreateSkillInput,
-  SkillKey,
-  SkillListQuery,
-  SkillStore,
-  SkillView,
-  UpdateSkillInput,
-} from '@ct-agents/protocol';
-
-type SkillRow = {
-  app_id?: string | null;
-  version: number;
-  name: string;
-  description: string;
-  instructions: string;
-  enabled: boolean;
-  created_at?: string | Date | null;
-  updated_at?: string | Date | null;
-};
-
-function isUniqueViolation(error: unknown) {
-  return error !== null
-    && typeof error === 'object'
-    && 'code' in error
-    && error.code === '23505';
-}
-
-function toIsoString(value: string | Date | null | undefined) {
-  if (!value) return undefined;
-  return value instanceof Date ? value.toISOString() : value;
-}
-
-function mapSkillRow(row: SkillRow): SkillView {
-  return {
-    appId: row.app_id ?? null,
-    version: row.version,
-    name: row.name,
-    description: row.description,
-    instructions: row.instructions,
-    enabled: row.enabled,
-    createdAt: toIsoString(row.created_at),
-    updatedAt: toIsoString(row.updated_at),
-  };
-}
-
-export class PostgresSkillStore implements SkillStore {
-  constructor(private readonly pool: SqlPool) {}
-
-  async list(query?: SkillListQuery): Promise<SkillView[]> {
-    const client = await this.pool.connect();
-    try {
-      // 与 PostgresPromptFragmentStore 保持一致的 app 归属过滤：
-      // 指定 appId 时按 app 精确过滤，includeGlobal 时额外纳入 global（app_id is null）。
-      const conditions = ['enabled = true'];
-      const params: unknown[] = [];
-      if (query?.appId === null) {
-        conditions.push('app_id is null');
-      } else if (query?.appId) {
-        params.push(query.appId);
-        conditions.push(query.includeGlobal ? '(app_id = $1 or app_id is null)' : 'app_id = $1');
-      }
-      const effective = query?.resolution === 'effective' && Boolean(query.appId);
-      const result = await client.query<SkillRow>(`
-        select ${effective ? 'distinct on (name)' : ''}
-          app_id, version, name, description, instructions, enabled, created_at, updated_at
-        from agent.agent_skills
-        where ${conditions.join(' and ')}
-        order by name asc${effective ? ', (app_id = $1) desc' : ', app_id asc nulls first'}
-      `, params);
-      return result.rows.map(mapSkillRow);
-    } finally {
-      client.release();
-    }
-  }
-
-  async get(key: SkillKey): Promise<SkillView | null> {
-    const client = await this.pool.connect();
-    try {
-      const result = await client.query<SkillRow>(`
-        select app_id, version, name, description, instructions, enabled, created_at, updated_at
-        from agent.agent_skills
-        where app_id is not distinct from $1 and name = $2
-        limit 1
-      `, [key.appId, key.name]);
-      return result.rows[0] ? mapSkillRow(result.rows[0]) : null;
-    } finally {
-      client.release();
-    }
-  }
-
-  async create(input: CreateSkillInput): Promise<SkillView> {
-    const client = await this.pool.connect();
-    try {
-      const result = await client.query<SkillRow>(`
-        insert into agent.agent_skills (
-          app_id,
-          name,
-          description,
-          instructions,
-          enabled
-        )
-        values ($1, $2, $3, $4, $5)
-        returning app_id, version, name, description, instructions, enabled, created_at, updated_at
-      `, [
-        input.appId ?? null,
-        input.name.trim(),
-        input.description.trim(),
-        input.instructions.trim(),
-        input.enabled ?? true,
-      ]);
-      return mapSkillRow(result.rows[0]);
-    } catch (error) {
-      if (isUniqueViolation(error)) {
-        throw new Error(`SKILL_ALREADY_EXISTS: ${input.name.trim()}`);
-      }
-      throw error;
-    } finally {
-      client.release();
-    }
-  }
-
-  async update(input: UpdateSkillInput): Promise<SkillView> {
-    const current = await this.get({ appId: input.appId, name: input.name });
-    if (!current) {
-      throw new Error(`Skill not found: ${input.name}`);
-    }
-
-    const client = await this.pool.connect();
-    try {
-      // app_id + name 是稳定管理身份，仅更新内容与启用状态。
-      const result = await client.query<SkillRow>(`
-        update agent.agent_skills
-        set
-          description = $3,
-          instructions = $4,
-          enabled = $5,
-          version = version + 1,
-          updated_at = now()
-        where app_id is not distinct from $1 and name = $2 and version = $6
-        returning app_id, version, name, description, instructions, enabled, created_at, updated_at
-      `, [
-        input.appId,
-        input.name,
-        input.description === undefined ? current.description : input.description.trim(),
-        input.instructions === undefined ? current.instructions : input.instructions.trim(),
-        input.enabled ?? current.enabled,
-        input.baseVersion,
-      ]);
-
-      if (!result.rows[0]) {
-        throw new Error(`VERSION_CONFLICT: Skill has changed: ${input.name}`);
-      }
-
-      return mapSkillRow(result.rows[0]);
-    } finally {
-      client.release();
-    }
-  }
-
-  async delete(key: SkillKey): Promise<void> {
-    const client = await this.pool.connect();
-    try {
-      await client.query(`
-        update agent.agent_skills
-        set
-          enabled = false,
-          version = version + 1,
-          updated_at = now()
-        where app_id is not distinct from $1 and name = $2
-      `, [key.appId, key.name]);
-    } finally {
-      client.release();
-    }
-  }
-}