@k2b/cloud 0.6.0 → 0.8.0

package/src/ai/skill-tool.ts

@@ -2,11 +2,27 @@ import { z } from "zod";
 import type { AccessSubject } from "../server";
 import { AI_SKILL_FILE_MOUNT } from "./file-mount";
 import { AI_SHORT_ID_PATTERN } from "./short-id";
-import { searchAiSkillCatalog } from "./skill-catalog";
 import { AI_SKILL_NAME_MAX_CHARS, AI_SKILL_NAME_PATTERN } from "./skill-format";
 import { aiSkills } from "./skills";
 import { defineAiTool } from "./tools";
 
+/** Explicit selections use the same permission check and turn snapshot as load_skill. */
+export async function loadSelectedAiSkills(ids: readonly string[], turnId: string, subject: AccessSubject | null, allowed: boolean) {
+  const loaded = [];
+  for (const id of new Set(ids)) {
+    if (!subject || !allowed) throw new Error("The selected Skill requires a model and tool scope that allow Skills.");
+    const skill = await aiSkills.loadForTurn(turnId, { id }, subject);
+    if (!skill) throw new Error(`Selected Skill ${id} is unavailable or access was revoked.`);
+    loaded.push({
+      name: skill.name,
+      revision: skill.revision,
+      instructions: skill.instructions,
+      files: skill.files.map((file) => file.path),
+    });
+  }
+  return loaded;
+}
+
 export const CloudAiLoadSkillInputSchema = z
   .object({
     name: z
@@ -58,7 +74,7 @@ export const createCloudAiLoadSkillTool = (subject: AccessSubject) =>
   });
 
 export const CloudAiSearchSkillsInputSchema = z.object({
-  query: z.string().trim().min(1).max(200).describe("Short English terms describing the workflow or domain to find."),
+  query: z.string().trim().min(1).max(200).describe("Words from the Skill name or description; minor typos are tolerated."),
   limit: z.number().int().min(1).max(20).default(10),
 });
 
@@ -71,11 +87,11 @@ export const createCloudAiSearchSkillsTool = (subject: AccessSubject) =>
   defineAiTool({
     name: "search_skills",
     description:
-      "Search enabled Assistant Skills omitted from the bounded system-prompt catalog. Use short English domain or workflow terms, then load_skill with an exact returned name.",
+      "Search enabled Assistant Skills omitted from the bounded system-prompt catalog. Search names and descriptions with short domain or workflow terms; minor typos are tolerated. Then load_skill with an exact returned name.",
     inputSchema: CloudAiSearchSkillsInputSchema,
     outputSchema: CloudAiSearchSkillsOutputSchema,
     approval: "never",
   }).server(async (input) => {
-    const skills = (await aiSkills.list(subject)).filter((skill) => skill.enabled);
-    return searchAiSkillCatalog(skills, input.query, input.limit);
+    const result = await aiSkills.search(subject, input.query, input.limit);
+    return { skills: result.skills.map(({ name, description }) => ({ name, description })), more: result.more };
   });

package/src/ai/skills-routes.ts

@@ -1,7 +1,8 @@
 import { Hono, type MiddlewareHandler } from "hono";
 import { z } from "zod";
-import { PrincipalSchema } from "../contracts/shared";
+import { AuthenticatedPrincipalSchema } from "../contracts/shared";
 import { type AuthContext, auth, err, fail, ok, rateLimit, respond, v } from "../server";
+import { aiProjects } from "./projects";
 import {
   AI_SKILL_DESCRIPTION_MAX_CHARS,
   AI_SKILL_EXTRA_FRONTMATTER_MAX_CHARS,
@@ -38,7 +39,7 @@ const SkillFieldsSchema = z.object({
 });
 
 const UpdateSkillSchema = SkillFieldsSchema.extend({ expectedRevision: z.number().int().positive() });
-const SkillAccessSchema = z.object({ principal: PrincipalSchema, permission: z.enum(["read", "write", "admin"]) });
+const SkillAccessSchema = z.object({ principal: AuthenticatedPrincipalSchema, permission: z.enum(["read", "write", "admin"]) });
 const SkillAccessUpdateSchema = z.object({ permission: z.enum(["read", "write", "admin"]) });
 const SkillEnabledSchema = z.object({ enabled: z.boolean() });
 
@@ -56,8 +57,52 @@ type AiSkillsRouteDependencies = {
 const buildAiSkillsRoutes = (dependencies: AiSkillsRouteDependencies = {}) =>
   new Hono<AuthContext>()
     .use(dependencies.limit ?? rateLimit())
-    .use("*", dependencies.authenticate ?? auth.requireRole("*"))
-    .get("/", async (c) => respond(c, ok({ skills: (await aiSkills.list(c.get("accessSubject") ?? null)).map(publicSummary) })))
+    .use("*", dependencies.authenticate ?? auth.requireRole("authenticated"))
+    .get("/", v("query", z.object({ q: z.string().trim().max(200).optional() })), async (c) => {
+      const subject = c.get("accessSubject") ?? null;
+      const { q } = c.req.valid("query");
+      const skills = q === undefined ? await aiSkills.list(subject) : (await aiSkills.search(subject, q)).skills;
+      return respond(c, ok({ skills: skills.map(publicSummary) }));
+    })
+    .get(
+      "/project-links/:projectId",
+      v(
+        "query",
+        z.object({
+          q: z.string().max(200).default(""),
+          page: z.coerce.number().int().min(1).max(100000).default(1),
+          available: z.enum(["true", "false"]).default("false"),
+        }),
+      ),
+      async (c) => {
+        const subject = c.get("accessSubject") ?? null,
+          query = c.req.valid("query");
+        const project = await aiProjects.getByShortId(c.req.param("projectId")!, subject, query.available === "true" ? "admin" : "read");
+        const result = project
+          ? await aiSkills.projectSkills(project.id, subject, { query: query.q, page: query.page, available: query.available === "true" })
+          : null;
+        return result ? respond(c, ok({ ...result, items: result.items.map(publicSummary) })) : respond(c, fail(err.notFound("Project")));
+      },
+    )
+    .get("/:skillId/projects", async (c) => {
+      const subject = c.get("accessSubject") ?? null;
+      const skill = await aiSkills.getByShortId(c.req.param("skillId")!, subject, "admin");
+      const projects = skill ? await aiSkills.linkedProjects(skill.id, subject) : null;
+      return projects
+        ? respond(c, ok({ projects: projects.map((project) => ({ id: project.shortId, name: project.name })) }))
+        : respond(c, fail(err.notFound("Skill")));
+    })
+    .put("/:skillId/projects/:projectId", v("json", z.object({ linked: z.boolean() }).strict()), async (c) => {
+      const subject = c.get("accessSubject") ?? null;
+      const [skill, project] = await Promise.all([
+        aiSkills.getByShortId(c.req.param("skillId")!, subject, "admin"),
+        aiProjects.getByShortId(c.req.param("projectId")!, subject, "admin"),
+      ]);
+      const linked = c.req.valid("json").linked;
+      return skill && project && (await aiSkills.linkProject(skill.id, project.id, linked, subject))
+        ? respond(c, ok({ linked }))
+        : respond(c, fail(err.notFound("Skill or Project")));
+    })
     .get("/templates/:name", dependencies.authenticate ?? auth.requireRole("authenticated"), (c) => {
       if (!c.get("accessSubject")) return respond(c, fail(err.forbidden("Skill templates require an authenticated access subject.")));
       const template = getBuiltinAiSkillTemplate(c.req.param("name"));