@fungi.computer/oyster 0.20.1 → 0.20.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -41,5 +41,6 @@ export declare function localDesktopState(input: Readonly<{
41
41
  export declare function installLocalStarter(app: StarterApp, input: Readonly<{
42
42
  url: string;
43
43
  key: string;
44
+ packageStoreDirectory: string;
44
45
  signal?: AbortSignal;
45
46
  }>): Promise<void>;
@@ -126,6 +126,7 @@ export async function installLocalStarter(app, input) {
126
126
  appId: app.appId,
127
127
  sourceDirectory: source,
128
128
  sourceRevision: `git:${commit}`,
129
+ packageStoreDirectory: input.packageStoreDirectory,
129
130
  recipe: appBuildRecipe(readBuildManifest(await git(source, ["show", `${commit}:package.json`], signal)), ""),
130
131
  outDirectory: release,
131
132
  signal,
@@ -38,6 +38,7 @@ export type TryEffects = Readonly<{
38
38
  /** Prepare Tourtois without changing an existing installation or its approval. */
39
39
  installDesktop: (input: {
40
40
  directory: string;
41
+ packageStoreDirectory: string;
41
42
  url: string;
42
43
  key: string;
43
44
  signal: AbortSignal;
@@ -46,6 +47,7 @@ export type TryEffects = Readonly<{
46
47
  installStarter: (app: StarterApp, input: {
47
48
  url: string;
48
49
  key: string;
50
+ packageStoreDirectory: string;
49
51
  signal: AbortSignal;
50
52
  }) => Promise<"installed" | "already-installed">;
51
53
  /** Tell the Oyster which starter Apps are not ready yet. */
@@ -762,6 +762,7 @@ export async function tryOyster(args, effects = realEffects, ui = createTryCli(a
762
762
  ui.warn(`The Computer runtime is unavailable (${innermostError(cause).message}).`, "Files remain available. Fix the runtime and restart oyster try to run commands.");
763
763
  }
764
764
  });
765
+ const packageStoreDirectory = join(directory, ".oyster", "package-store");
765
766
  const desktop = await setupTask(fresh
766
767
  ? "Installing Hello and building Tourtois"
767
768
  : "Installing Hello and checking Tourtois", async () => {
@@ -771,6 +772,7 @@ export async function tryOyster(args, effects = realEffects, ui = createTryCli(a
771
772
  const preparation = new AbortController();
772
773
  const input = {
773
774
  directory,
775
+ packageStoreDirectory,
774
776
  url,
775
777
  key,
776
778
  signal: AbortSignal.any([signal, preparation.signal]),
@@ -876,7 +878,7 @@ export async function tryOyster(args, effects = realEffects, ui = createTryCli(a
876
878
  // Agents answer with a model; say up front, once, what to do when none is.
877
879
  if ((await effects.modelSetup({ url, key, signal })) === "missing")
878
880
  ui.warn("No model is connected yet, so Agents can't answer.", `Open Oyster, choose Keys, then Model keys, and add a key. Guide: ${modelKeyGuideUrl}`);
879
- // The rest of the starter Apps build here, one at a time, while the desktop
881
+ // The rest of the starter Apps build here, two at a time, while the desktop
880
882
  // is already usable. Each reports one line; a failure never stops the rest.
881
883
  const starters = trialStarterOrder.map((id) => {
882
884
  const app = standaloneAppSet.find((item) => item.installationId === id);
@@ -892,13 +894,19 @@ export async function tryOyster(args, effects = realEffects, ui = createTryCli(a
892
894
  const stopped = () => trialSignal.aborted;
893
895
  // What the desktop shows for each starter App that is not ready yet.
894
896
  const pending = new Map();
895
- const trial = { url, key, signal: trialSignal };
896
- const publish = () => effects
897
- .reportStarters(trial, [...pending.values()])
898
- .then(undefined, (cause) => {
899
- if (!stopped())
900
- ui.warn(`The desktop could not be told which Apps are installing (${innermostError(cause).message}).`, "Installs continue; the desktop will not show their progress.");
901
- });
897
+ const trial = { url, key, packageStoreDirectory, signal: trialSignal };
898
+ let publishing = Promise.resolve();
899
+ const publish = () => {
900
+ const installing = [...pending.values()];
901
+ // Concurrent builds still publish their state transitions in order.
902
+ publishing = publishing
903
+ .then(() => effects.reportStarters(trial, installing))
904
+ .then(undefined, (cause) => {
905
+ if (!stopped())
906
+ ui.warn(`The desktop could not be told which Apps are installing (${innermostError(cause).message}).`, "Installs continue; the desktop will not show their progress.");
907
+ });
908
+ return publishing;
909
+ };
902
910
  const failureReason = (cause) => {
903
911
  const failure = innermostError(cause);
904
912
  return {
@@ -956,11 +964,22 @@ export async function tryOyster(args, effects = realEffects, ui = createTryCli(a
956
964
  state: "installing",
957
965
  });
958
966
  await publish();
959
- for (const app of starters) {
960
- if (stopped())
961
- return;
962
- await installOne(app);
963
- }
967
+ let next = 0;
968
+ const installNext = async () => {
969
+ while (!stopped()) {
970
+ const app = starters[next++];
971
+ if (app === undefined)
972
+ return;
973
+ await installOne(app);
974
+ }
975
+ };
976
+ const installs = await Promise.allSettled([
977
+ installNext(),
978
+ installNext(),
979
+ ]);
980
+ for (const result of installs)
981
+ if (result.status === "rejected")
982
+ throw result.reason;
964
983
  // Then answer the desktop's retry asks until the trial stops.
965
984
  while (!stopped()) {
966
985
  const waited = await sleep(retryPollMs, undefined, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fungi.computer/oyster",
3
- "version": "0.20.1",
3
+ "version": "0.20.3",
4
4
  "author": "Levi <levi@technomancy.dev>",
5
5
  "description": "Oyster by Fungi: open-source Apps for people and AI agents. Try with one command or run on your own Cloudflare account.",
6
6
  "homepage": "https://docs.fungi.computer/oyster",
@@ -346,9 +346,9 @@
346
346
  "@fungi.computer/capnweb": "0.12.0-fungi.0",
347
347
  "@fungi.computer/caps": "0.10.5",
348
348
  "@fungi.computer/carrier": "0.2.4",
349
- "@fungi.computer/computer": "0.8.2",
349
+ "@fungi.computer/computer": "0.8.3",
350
350
  "@fungi.computer/computer-contract": "0.1.0",
351
- "@fungi.computer/darkroom": "0.5.6",
351
+ "@fungi.computer/darkroom": "0.5.7",
352
352
  "@fungi.computer/ear-tag": "0.1.0",
353
353
  "@fungi.computer/forage": "0.3.5",
354
354
  "@fungi.computer/gills": "0.3.0",
@@ -384,7 +384,7 @@
384
384
  "path-to-regexp": "8.4.2",
385
385
  "strip-ansi": "7.2.0",
386
386
  "zod": "4.4.3",
387
- "wrangler": "4.156.2"
387
+ "wrangler": "4.159.0"
388
388
  },
389
389
  "license": "MIT",
390
390
  "peerDependencies": {