apps 0.0.1-beta.35 → 0.0.1-beta.37

package/js/skills.js

@@ -5,11 +5,11 @@ import {
 import "./chunk-JU7F4PRK.js";
 import {
   failOnNetworkRefusal
-} from "./chunk-SRB2WDU7.js";
+} from "./chunk-D45FU4TZ.js";
 import {
   folderSkillsEffect,
   skillFromFiles
-} from "./chunk-FFTALB6S.js";
+} from "./chunk-BWUHMKHQ.js";
 import {
   accountProviderError,
   httpProviderError
@@ -29,14 +29,15 @@ import {
   SkillLoadFailed,
   SkillServiceName,
   skillLoadLimits
-} from "./chunk-I7CNZ4CM.js";
-import "./chunk-KZFV3WCJ.js";
+} from "./chunk-KEZ4YZSP.js";
+import "./chunk-24EIFQYZ.js";
 import {
   FetchHttpClient_exports
 } from "./chunk-TADLIUEU.js";
 import {
   wrap
 } from "./chunk-POOIHRPF.js";
+import "./chunk-2FWXCU5I.js";
 import "./chunk-BI45HZWM.js";
 import "./chunk-PHO7HXTC.js";
 import "./chunk-V5DWGYRK.js";
@@ -606,18 +607,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 refusedRequest = (refused) => new SkillLoadFailed({
-  reason: "source",
-  status: networkRefusalStatus,
-  message: refused.message.slice(0, 500)
-});
+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;
@@ -640,7 +638,7 @@ var reader = (transport) => Effect_exports.gen(function* () {
     });
     if (!["https:", "http:"].includes(parsed.protocol) || parsed.username || parsed.password || parsed.hash)
       return yield* failed("source");
-    const refused = request.refused ?? refusedRequest;
+    const refusal = request.refused ?? ((refused) => refused);
     const client = HttpClient_exports.withScope(yield* HttpClient_exports.HttpClient);
     const headers = {
       "User-Agent": "executor-skills",
@@ -652,12 +650,12 @@ var reader = (transport) => Effect_exports.gen(function* () {
       headers,
       body: HttpBody_exports.uint8Array(request.body, request.headers?.["Content-Type"])
     })).pipe(
-      // `ctx.fetch` rejects a request Executor's app network refused.
+      // `ctx.fetch` rejects with a network refusal; any other failed request got no answer.
       Effect_exports.mapError(
-        (error) => Schema_exports.is(NetworkRefused)(error.cause) ? refused(error.cause) : failed("request")
+        (error) => Schema_exports.is(NetworkRefused)(error.cause) ? refusal(error.cause) : failed("request")
       )
     );
-    yield* failOnNetworkRefusal(response).pipe(Effect_exports.mapError(refused));
+    yield* failOnNetworkRefusal(response).pipe(Effect_exports.mapError(refusal));
     if (response.status < 200 || response.status >= 300)
       return yield* rejected(response.status, response.headers);
     const chunks = [];
@@ -711,8 +709,8 @@ var githubRequests = (remote, repo, token) => {
   const refused = (host) => (refusal) => refusal.refusal.reason === "credential_host" ? new SkillLoadFailed({
     reason: "source",
     status: networkRefusalStatus,
-    message: `Executor did not send the GitHub token to ${host}. The account's provider must declare hosts ${githubHosts.join(" and ")}; reconnect an account connected with other hosts.`
-  }) : refusedRequest(refusal);
+    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: {
@@ -733,12 +731,21 @@ var resolveCommit = (github, ref) => Effect_exports.gen(function* () {
   const names = refCandidates(ref);
   const response = yield* github.upload(lsRefsRequest(names)).pipe(
     Effect_exports.mapError((error) => {
-      const hidden = error.reason === "request" && (error.status === 404 || error.status === 401 && !github.authenticated);
-      return hidden ? new SkillLoadFailed({
-        reason: "source",
-        message: github.authenticated ? `GitHub has no repository named ${repo} that the account's token can read.` : `GitHub has no public repository named ${repo}. To read a private repository, pass a GitHub account and its token.`,
-        status: error.status
-      }) : 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));
@@ -746,7 +753,8 @@ var resolveCommit = (github, ref) => Effect_exports.gen(function* () {
   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;
 });
@@ -795,10 +803,13 @@ var cachedSkillDirectories = (cache, transport, options, commit) => Effect_expor
       { 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,
@@ -811,10 +822,13 @@ var cachedCatalog = (options, prefix, load) => options.cache === void 0 ? load(o
 }).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]+$/));
@@ -832,7 +846,7 @@ var githubCache = (options) => options.account !== void 0 && !Schema_exports.is(
   options.token,
   (problem) => new SkillLoadFailed({ reason: "source", message: scopeMessages[problem] })
 );
-var attributed = (account) => (error) => account !== void 0 && error.reason === "request" && (error.status === 401 || error.status === 403) ? accountProviderError(
+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

package/js/ui/serving.js

@@ -7,8 +7,9 @@ import {
 } from "../chunk-WDBUOIWV.js";
 import {
   CurrentTelemetryConfig
-} from "../chunk-KZFV3WCJ.js";
+} from "../chunk-24EIFQYZ.js";
 import "../chunk-TADLIUEU.js";
+import "../chunk-2FWXCU5I.js";
 import "../chunk-BI45HZWM.js";
 import "../chunk-PHO7HXTC.js";
 import "../chunk-V5DWGYRK.js";

package/package.json

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