apps 0.0.1-beta.4 → 0.0.1-beta.40

package/js/react.js

@@ -2,11 +2,10 @@ import {
   AsyncResult_exports,
   AtomRegistry_exports,
   queryCommitted
-} from "./chunk-EVJUVWN2.js";
-import "./chunk-M6ZRRIBI.js";
+} from "./chunk-DKUEYTYD.js";
 import {
   Option_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-MXDKXAY4.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/react.ts

package/js/skills/effect.js

@@ -1,9 +1,12 @@
 import {
   folderSkillsEffect,
   skillFromFiles
-} from "../chunk-FDNTX5QJ.js";
-import "../chunk-YEJOQEII.js";
-import "../chunk-FW5HBOIK.js";
+} from "../chunk-CQD3WSYH.js";
+import "../chunk-UOZMSUJ2.js";
+import "../chunk-KAQD3DTI.js";
+import "../chunk-VIU2XXA7.js";
+import "../chunk-3MMG2H6M.js";
+import "../chunk-MXDKXAY4.js";
 import "../chunk-CZ7CSFO4.js";
 export {
   folderSkillsEffect,

package/js/skills.js

@@ -1,15 +1,24 @@
 import {
-  catalogCache
-} from "./chunk-5MQZEB6Y.js";
-import "./chunk-D47C7KG5.js";
+  catalogCache,
+  catalogScope
+} from "./chunk-KANDIVIH.js";
+import "./chunk-RIXVGVA6.js";
+import {
+  failOnNetworkRefusal
+} from "./chunk-KIM5HXNK.js";
 import {
   folderSkillsEffect,
   skillFromFiles
-} from "./chunk-FDNTX5QJ.js";
+} from "./chunk-CQD3WSYH.js";
 import {
+  accountProviderError,
   httpProviderError
-} from "./chunk-ZJWDMTE3.js";
-import "./chunk-LGIYBDWA.js";
+} from "./chunk-EM4UL26F.js";
+import {
+  NetworkRefused,
+  ProviderError,
+  networkRefusalStatus
+} from "./chunk-P7MGDPFD.js";
 import {
   AppSkillMetadata,
   AppSkillSource,
@@ -19,25 +28,28 @@ import {
   SkillLoadFailed,
   SkillServiceName,
   skillLoadLimits
-} from "./chunk-YEJOQEII.js";
-import "./chunk-W7D7WVSY.js";
+} from "./chunk-UOZMSUJ2.js";
+import "./chunk-PNVCCB4L.js";
 import {
   FetchHttpClient_exports
-} from "./chunk-HDJH3RPR.js";
+} from "./chunk-VJQXXOQ3.js";
+import {
+  wrap
+} from "./chunk-GHXRRFZA.js";
+import "./chunk-KAQD3DTI.js";
+import "./chunk-YQ35E7KS.js";
+import "./chunk-VIU2XXA7.js";
 import {
   HttpBody_exports,
   HttpClient_exports
-} from "./chunk-QKHR7BMF.js";
-import {
-  wrap
-} from "./chunk-WFSQXYUT.js";
-import "./chunk-SATWJKN6.js";
+} from "./chunk-3MMG2H6M.js";
 import {
+  Base64_exports,
   Effect_exports,
   Ref_exports,
   Schema_exports,
   Stream_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-MXDKXAY4.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/implementation/inflate.ts
@@ -593,13 +605,15 @@ var describe = (service, { reason, status }) => {
 };
 var withService = (service) => (effect) => service === void 0 || !Schema_exports.is(SkillServiceName)(service) ? effect : effect.pipe(
   Effect_exports.mapError(
-    (error) => !error.message ? new SkillLoadFailed({
+    (error) => Schema_exports.is(SkillLoadFailed)(error) && !error.message ? new SkillLoadFailed({
       reason: error.reason,
       message: describe(service, error),
-      ...error.status === void 0 ? {} : { status: error.status }
+      ...error.status === void 0 ? {} : { status: error.status },
+      ...error.missing === void 0 ? {} : { missing: error.missing }
     }) : error
   )
 );
+var loaderFailure = (error, otherwise) => Schema_exports.is(SkillLoadFailed)(error) || Schema_exports.is(NetworkRefused)(error) ? error : otherwise();
 var parse = (schema, input) => Schema_exports.decodeUnknownEffect(schema)(input).pipe(Effect_exports.mapError(() => failed("document")));
 var resourcePath = (path) => {
   if (!Schema_exports.is(SkillFilePath)(path)) return false;
@@ -615,23 +629,31 @@ var resourcePath = (path) => {
 var pathUrl = (base, path) => new URL(path.split("/").map(encodeURIComponent).join("/"), base).href;
 var reader = (transport) => Effect_exports.gen(function* () {
   const budget = yield* Ref_exports.make(0);
-  const fetchBytes = (url, post) => Effect_exports.gen(function* () {
+  const fetchBytes = (url, request = {}) => Effect_exports.gen(function* () {
     const parsed = yield* Effect_exports.try({
       try: () => new URL(url),
       catch: () => failed("source")
     });
     if (!["https:", "http:"].includes(parsed.protocol) || parsed.username || parsed.password || parsed.hash)
       return yield* failed("source");
+    const refusal = request.refused ?? ((refused) => refused);
     const client = HttpClient_exports.withScope(yield* HttpClient_exports.HttpClient);
     const headers = {
       "User-Agent": "executor-skills",
       Accept: "application/json, text/plain",
-      "Cache-Control": "no-cache"
+      "Cache-Control": "no-cache",
+      ...request.headers
     };
-    const response = yield* (post === void 0 ? client.get(parsed, { headers }) : client.post(parsed, {
-      headers: { ...headers, ...post.headers },
-      body: HttpBody_exports.uint8Array(post.body, post.headers["Content-Type"])
-    })).pipe(Effect_exports.mapError(() => failed("request")));
+    const response = yield* (request.body === void 0 ? client.get(parsed, { headers }) : client.post(parsed, {
+      headers,
+      body: HttpBody_exports.uint8Array(request.body, request.headers?.["Content-Type"])
+    })).pipe(
+      // `ctx.fetch` rejects with a network refusal; any other failed request got no answer.
+      Effect_exports.mapError(
+        (error) => Schema_exports.is(NetworkRefused)(error.cause) ? refusal(error.cause) : failed("request")
+      )
+    );
+    yield* failOnNetworkRefusal(response).pipe(Effect_exports.mapError(refusal));
     if (response.status < 200 || response.status >= 300)
       return yield* rejected(response.status, response.headers);
     const chunks = [];
@@ -661,7 +683,7 @@ var reader = (transport) => Effect_exports.gen(function* () {
     Effect_exports.provideService(FetchHttpClient_exports.RequestInit, { redirect: "manual" }),
     Effect_exports.provideService(FetchHttpClient_exports.Fetch, transport.fetch ?? globalThis.fetch)
   );
-  const read = (url) => fetchBytes(url).pipe(
+  const read = (url, request = {}) => fetchBytes(url, request).pipe(
     Effect_exports.flatMap(
       (result) => Effect_exports.try({
         try: () => new TextDecoder("utf-8", { fatal: true }).decode(result),
@@ -680,35 +702,61 @@ var git = (run) => Effect_exports.tryPromise({
   try: async () => run(),
   catch: (error) => error instanceof InflateLimitExceeded ? failed("limit") : unreadable()
 });
-var resolveCommit = (remote, repo, ref) => Effect_exports.gen(function* () {
+var githubHosts = ["github.com", "raw.githubusercontent.com"];
+var githubRequests = (remote, repo, token) => {
+  const refused = (host) => (refusal) => refusal.refusal.reason === "credential_host" ? new SkillLoadFailed({
+    reason: "source",
+    status: networkRefusalStatus,
+    message: `A request with the GitHub token to ${host} was refused because the account's provider does not declare that host. The provider must declare hosts ${githubHosts.join(" and ")}; reconnect an account connected with other hosts.`
+  }) : refusal;
+  const upload = (body) => remote.fetchBytes(`https://${githubHosts[0]}/${repo}.git/git-upload-pack`, {
+    body,
+    headers: {
+      ...gitRequestHeaders,
+      ...token === void 0 ? {} : { Authorization: `Basic ${Base64_exports.encode(`x-access-token:${token}`)}` }
+    },
+    refused: refused(githubHosts[0])
+  });
+  const file = (commit, path) => remote.read(pathUrl(`https://${githubHosts[1]}/${repo}/${commit}/`, path), {
+    ...token === void 0 ? {} : { headers: { Authorization: `token ${token}` } },
+    refused: refused(githubHosts[1])
+  });
+  return { repo, authenticated: token !== void 0, upload, file };
+};
+var resolveCommit = (github, ref) => Effect_exports.gen(function* () {
+  const { repo } = github;
   if (ref !== void 0 && /^[a-f0-9]{40}$/.test(ref)) return ref;
   const names = refCandidates(ref);
-  const response = yield* remote.fetchBytes(`https://github.com/${repo}.git/git-upload-pack`, {
-    body: lsRefsRequest(names),
-    headers: gitRequestHeaders
-  }).pipe(
-    // GitHub asks for credentials when a repository is missing or private.
-    Effect_exports.mapError(
-      (error) => error.status === 401 || error.status === 404 ? new SkillLoadFailed({
-        reason: "source",
-        message: `GitHub has no public repository named ${repo}.`,
-        status: error.status
-      }) : error
-    )
+  const response = yield* github.upload(lsRefsRequest(names)).pipe(
+    Effect_exports.mapError((error) => {
+      if (!Schema_exports.is(SkillLoadFailed)(error) || error.reason !== "request") return error;
+      if (!github.authenticated && (error.status === 404 || error.status === 401))
+        return new SkillLoadFailed({
+          reason: "source",
+          message: `Reading GitHub repository ${repo} without credentials returned HTTP ${error.status}: it may not exist, or it may be private. To read a private repository, pass a GitHub account and its token.`,
+          status: error.status,
+          missing: "repository"
+        });
+      if (github.authenticated && error.status === 404)
+        return new SkillLoadFailed({
+          reason: "request",
+          message: `GitHub repository ${repo} is not available with the account's token (HTTP 404). Check the repository name and that the token can read it.`,
+          status: error.status
+        });
+      return error;
+    })
   );
   const refs = yield* git(() => parseLsRefs(response));
   const commit = names.map((name) => refs.get(name)).find((sha) => sha !== void 0);
   if (commit === void 0)
     return yield* new SkillLoadFailed({
       reason: "source",
-      message: `GitHub repository ${repo} has no branch or tag named ${ref}.`
+      message: `The refs read from GitHub repository ${repo} include no branch or tag named ${ref}.`,
+      missing: "ref"
     });
   return commit;
 });
-var listFiles = (remote, repo, commit, path) => remote.fetchBytes(`https://github.com/${repo}.git/git-upload-pack`, {
-  body: treeFetchRequest(commit),
-  headers: gitRequestHeaders
-}).pipe(
+var listFiles = (github, commit, path) => github.upload(treeFetchRequest(commit)).pipe(
   Effect_exports.flatMap(
     (response) => git(
       () => parseTreeFetch(response, commit, path, { objectBytes: skillLoadLimits.fileBytes })
@@ -721,8 +769,8 @@ var SkillDirectories = Schema_exports.Array(
     files: Schema_exports.Array(Schema_exports.Struct({ path: Schema_exports.String, mode: Schema_exports.String }))
   })
 );
-var skillDirectories = (remote, repo, commit, path) => Effect_exports.gen(function* () {
-  const files = yield* listFiles(remote, repo, commit, path);
+var skillDirectories = (github, commit, path) => Effect_exports.gen(function* () {
+  const files = yield* listFiles(github, commit, path);
   const documents = files.filter(
     (file) => file.path === "SKILL.md" || file.path.endsWith("/SKILL.md")
   );
@@ -734,23 +782,32 @@ var skillDirectories = (remote, repo, commit, path) => Effect_exports.gen(functi
     return yield* failed("limit");
   return directories;
 });
-var cachedSkillDirectories = (cache, transport, repo, commit, path) => Effect_exports.tryPromise({
+var cachedSkillDirectories = (cache, transport, options, commit) => Effect_exports.tryPromise({
   try: () => cache.get({
-    key: ["apps/githubSkills/directories", 1, repo, commit, path ?? null],
+    key: ["apps/githubSkills/directories", 1, options.repo, commit, options.path ?? null],
     schema: wrap(SkillDirectories, false),
     freshFor: "7 days",
     load: (context) => Effect_exports.runPromise(
-      // Keep the author's fetch, as every other read in this load does.
+      // Keep the author's fetch and this read's token, as every other request in it does.
       reader({ fetch: transport.fetch, signal: context.signal }).pipe(
-        Effect_exports.flatMap((remote) => skillDirectories(remote, repo, commit, path))
+        Effect_exports.flatMap(
+          (remote) => skillDirectories(
+            githubRequests(remote, options.repo, options.token),
+            commit,
+            options.path
+          )
+        )
       ),
       { signal: context.signal }
     )
   }),
-  catch: (error) => Schema_exports.is(SkillLoadFailed)(error) ? error : new SkillLoadFailed({
-    reason: "request",
-    message: "Executor could not read or update the app cache for skills."
-  })
+  catch: (error) => loaderFailure(
+    error,
+    () => new SkillLoadFailed({
+      reason: "request",
+      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,
@@ -759,30 +816,55 @@ var cachedCatalog = (options, prefix, load) => options.cache === void 0 ? load(o
   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)
+  load: (context) => (context === void 0 ? load(options, options.cache) : load({ fetch: options.fetch, signal: context.signal }, context.cache)).pipe(Effect_exports.map((tools) => ({ tools })))
 }).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."
-    })
+    (error) => loaderFailure(
+      error,
+      () => new SkillLoadFailed({
+        reason: "request",
+        message: "Executor could not read or update the app cache for skills."
+      })
+    )
   )
 );
+var GitHubToken = Schema_exports.String.check(Schema_exports.isPattern(/^[\x21-\x7e]+$/u));
+var scopeMessages = {
+  "missing-account": "A GitHub token needs its account. Pass account: ctx.accounts.<slot> with it.",
+  "unselected-account": "The GitHub account is not one of this app's selected accounts."
+};
+var githubCache = (options) => options.account !== void 0 && !Schema_exports.is(GitHubToken)(options.token) ? Effect_exports.fail(
+  new SkillLoadFailed({
+    reason: "source",
+    message: "The GitHub account was passed without a valid token."
+  })
+) : catalogScope(
+  options,
+  options.token,
+  (problem) => new SkillLoadFailed({ reason: "source", message: scopeMessages[problem] })
+);
+var attributed = (account) => (error) => account !== void 0 && Schema_exports.is(SkillLoadFailed)(error) && error.reason === "request" && (error.status === 401 || error.status === 403) ? accountProviderError(
+  new ProviderError({
+    reason: error.status === 401 ? "unauthorized" : "rejected",
+    status: error.status
+  }),
+  account.id
+) : error;
 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 cache = yield* githubCache(options);
   return yield* cachedCatalog(
-    options,
+    cache === void 0 ? options : { ...options, cache },
     ["apps/githubSkills/catalog", 1, options.repo, options.ref ?? null, options.path ?? null],
-    (transport, cache) => githubCatalog(options, transport, cache)
+    (transport, cache2) => githubCatalog(options, transport, cache2)
   );
-}).pipe(withService("GitHub"));
+}).pipe(withService("GitHub"), Effect_exports.mapError(attributed(options.account)));
 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* 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 github = githubRequests(yield* reader(transport), options.repo, options.token);
+  const commit = yield* resolveCommit(github, options.ref);
+  const resources = yield* cache === void 0 ? skillDirectories(github, commit, options.path) : cachedSkillDirectories(cache, transport, options, commit);
   const skills = yield* Effect_exports.forEach(
     resources,
     ({ directory, files }) => Effect_exports.gen(function* () {
@@ -792,7 +874,7 @@ var githubCatalog = (options, transport, cache) => Effect_exports.gen(function*
           const path = file.path.slice(directory.length);
           if (!resourcePath(file.path) || !resourcePath(path) || file.mode === "120000")
             return yield* failed("source");
-          return { path, content: yield* remote.read(pathUrl(base, file.path)) };
+          return { path, content: yield* github.file(commit, file.path) };
         }),
         { concurrency: skillLoadLimits.concurrency }
       );