apps 0.0.1-beta.1 → 0.0.1-beta.2

package/js/skills/effect.js

@@ -1,8 +1,7 @@
 import {
   folderSkillsEffect,
   skillFromFiles
-} from "../chunk-ZTFQHGEB.js";
-import "../chunk-NCYXZN2G.js";
+} from "../chunk-FDNTX5QJ.js";
 import "../chunk-YEJOQEII.js";
 import "../chunk-FW5HBOIK.js";
 import "../chunk-CZ7CSFO4.js";

package/js/skills.js

@@ -1,13 +1,18 @@
+import {
+  catalogCache
+} from "./chunk-5MQZEB6Y.js";
+import "./chunk-D47C7KG5.js";
 import {
   folderSkillsEffect,
   skillFromFiles
-} from "./chunk-ZTFQHGEB.js";
-import "./chunk-NCYXZN2G.js";
+} from "./chunk-FDNTX5QJ.js";
 import {
   httpProviderError
 } from "./chunk-ZJWDMTE3.js";
+import "./chunk-LGIYBDWA.js";
 import {
   AppSkillMetadata,
+  AppSkillSource,
   AppSkills,
   SkillDefinitionInvalid,
   SkillFilePath,
@@ -25,7 +30,7 @@ import {
 } from "./chunk-QKHR7BMF.js";
 import {
   wrap
-} from "./chunk-2HHMABB6.js";
+} from "./chunk-WFSQXYUT.js";
 import "./chunk-SATWJKN6.js";
 import {
   Effect_exports,
@@ -729,13 +734,14 @@ var skillDirectories = (remote, repo, commit, path) => Effect_exports.gen(functi
     return yield* failed("limit");
   return directories;
 });
-var cachedSkillDirectories = (cache, repo, commit, path) => Effect_exports.tryPromise({
+var cachedSkillDirectories = (cache, transport, repo, commit, path) => Effect_exports.tryPromise({
   try: () => cache.get({
     key: ["apps/githubSkills/directories", 1, repo, commit, path ?? null],
     schema: wrap(SkillDirectories, false),
     freshFor: "7 days",
     load: (context) => Effect_exports.runPromise(
-      reader(context).pipe(
+      // Keep the author's fetch, as every other read in this load does.
+      reader({ fetch: transport.fetch, signal: context.signal }).pipe(
         Effect_exports.flatMap((remote) => skillDirectories(remote, repo, commit, path))
       ),
       { signal: context.signal }
@@ -746,12 +752,36 @@ var cachedSkillDirectories = (cache, repo, commit, path) => Effect_exports.tryPr
     message: "Executor could not read or update the app cache for skills."
   })
 });
+var cachedCatalog = (options, prefix, load) => options.cache === void 0 ? load(options, void 0) : catalogCache({
+  cache: options.cache,
+  ...options.freshFor === void 0 ? {} : { freshFor: options.freshFor },
+  ...options.staleFor === void 0 ? {} : { staleFor: options.staleFor },
+  prefix,
+  schema: AppSkillSource,
+  summary: { schema: AppSkillMetadata, of: ({ files: _files, ...metadata }) => metadata },
+  load: (context) => context === void 0 ? load(options, options.cache) : load({ fetch: options.fetch, signal: context.signal }, context.cache)
+}).pipe(
+  Effect_exports.flatMap((catalog) => catalog.list()),
+  Effect_exports.mapError(
+    (error) => Schema_exports.is(SkillLoadFailed)(error) ? error : new SkillLoadFailed({
+      reason: "request",
+      message: "Executor could not read or update the app cache for skills."
+    })
+  )
+);
 var githubSkillsEffect = (options) => Effect_exports.gen(function* () {
   if (!/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(options.repo) || options.path !== void 0 && !resourcePath(options.path))
     return yield* failed("source");
-  const remote = yield* reader(options);
+  return yield* cachedCatalog(
+    options,
+    ["apps/githubSkills/catalog", 1, options.repo, options.ref ?? null, options.path ?? null],
+    (transport, cache) => githubCatalog(options, transport, cache)
+  );
+}).pipe(withService("GitHub"));
+var githubCatalog = (options, transport, cache) => Effect_exports.gen(function* () {
+  const remote = yield* reader(transport);
   const commit = yield* resolveCommit(remote, options.repo, options.ref);
-  const resources = yield* options.cache === void 0 ? skillDirectories(remote, options.repo, commit, options.path) : cachedSkillDirectories(options.cache, options.repo, commit, options.path);
+  const resources = yield* cache === void 0 ? skillDirectories(remote, options.repo, commit, options.path) : cachedSkillDirectories(cache, transport, options.repo, commit, options.path);
   const base = `https://raw.githubusercontent.com/${options.repo}/${commit}/`;
   const skills = yield* Effect_exports.forEach(
     resources,
@@ -775,7 +805,7 @@ var githubSkillsEffect = (options) => Effect_exports.gen(function* () {
     { concurrency: 1 }
   );
   return yield* parse(AppSkills, skills);
-}).pipe(withService("GitHub"));
+});
 var Index = Schema_exports.Struct({
   skills: Schema_exports.Array(
     Schema_exports.Struct({
@@ -793,7 +823,14 @@ var wellKnownSkillsEffect = (options) => Effect_exports.gen(function* () {
   if (url.pathname === "/") url.pathname = "/.well-known/agent-skills/index.json";
   else if (!url.pathname.endsWith("index.json"))
     url.pathname = `${url.pathname.replace(/\/$/, "")}/index.json`;
-  const remote = yield* reader(options);
+  return yield* cachedCatalog(
+    options,
+    ["apps/wellKnownSkills/catalog", 1, url.href],
+    (transport) => wellKnownCatalog(url, transport)
+  );
+}).pipe(withService(URL.canParse(options.url) ? new URL(options.url).hostname : void 0));
+var wellKnownCatalog = (url, transport) => Effect_exports.gen(function* () {
+  const remote = yield* reader(transport);
   const first = yield* remote.read(url.href);
   const index = yield* parse(Schema_exports.fromJsonString(Index), first);
   if (index.skills.reduce((count, skill) => count + skill.files.length, 0) > skillLoadLimits.files)
@@ -818,7 +855,7 @@ var wellKnownSkillsEffect = (options) => Effect_exports.gen(function* () {
   );
   if ((yield* remote.read(url.href)) !== first) return yield* failed("changed");
   return yield* parse(AppSkills, skills);
-}).pipe(withService(URL.canParse(options.url) ? new URL(options.url).hostname : void 0));
+});
 
 // src/skills.ts
 var githubSkills = (options) => Effect_exports.runPromise(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps",
-  "version": "0.0.1-beta.1",
+  "version": "0.0.1-beta.2",
   "description": "TypeScript apps with typed tools, accounts, storage, and UI.",
   "type": "module",
   "sideEffects": false,