ignore: rework bootstrap so server lazy starts it

packages/opencode/src/project/bootstrap.ts

@@ -0,0 +1,13 @@
+import { Plugin } from "../plugin"
+import { Share } from "../share/share"
+import { Format } from "../format"
+import { LSP } from "../lsp"
+import { Snapshot } from "../snapshot"
+
+export async function InstanceBootstrap() {
+  await Plugin.init()
+  Share.init()
+  Format.init()
+  LSP.init()
+  Snapshot.init()
+}

packages/opencode/src/project/instance.ts

@@ -2,12 +2,32 @@ import { Context } from "../util/context"
 import { Project } from "./project"
 import { State } from "./state"
 
-const context = Context.create<{ directory: string; worktree: string; project: Project.Info }>("path")
+interface Context {
+  directory: string
+  worktree: string
+  project: Project.Info
+}
+const context = Context.create<Context>("instance")
+const cache = new Map<string, Context>()
 
 export const Instance = {
-  async provide<R>(directory: string, cb: () => R): Promise<R> {
-    const project = await Project.fromDirectory(directory)
-    return context.provide({ directory, worktree: project.worktree, project }, cb)
+  async provide<R>(input: { directory: string; init?: () => Promise<any>; fn: () => R }): Promise<R> {
+    let existing = cache.get(input.directory)
+    if (!existing) {
+      const project = await Project.fromDirectory(input.directory)
+      existing = {
+        directory: input.directory,
+        worktree: project.worktree,
+        project,
+      }
+    }
+    return context.provide(existing, async () => {
+      if (!cache.has(input.directory)) {
+        await input.init?.()
+        cache.set(input.directory, existing)
+      }
+      return input.fn()
+    })
   },
   get directory() {
     return context.use().directory

packages/opencode/src/project/project.ts

@@ -22,73 +22,64 @@ export namespace Project {
     })
   export type Info = z.infer<typeof Info>
 
-  const cache = new Map<string, Info>()
   export async function fromDirectory(directory: string) {
     log.info("fromDirectory", { directory })
-    const fn = async () => {
-      const matches = Filesystem.up({ targets: [".git"], start: directory })
-      const git = await matches.next().then((x) => x.value)
-      await matches.return()
-      if (!git) {
-        const project: Info = {
-          id: "global",
-          worktree: "/",
-          time: {
-            created: Date.now(),
-          },
-        }
-        await Storage.write<Info>(["project", "global"], project)
-        return project
-      }
-      let worktree = path.dirname(git)
-      const [id] = await $`git rev-list --max-parents=0 --all`
-        .quiet()
-        .nothrow()
-        .cwd(worktree)
-        .text()
-        .then((x) =>
-          x
-            .split("\n")
-            .filter(Boolean)
-            .map((x) => x.trim())
-            .toSorted(),
-        )
-      if (!id) {
-        const project: Info = {
-          id: "global",
-          worktree: "/",
-          time: {
-            created: Date.now(),
-          },
-        }
-        await Storage.write<Info>(["project", "global"], project)
-        return project
-      }
-      worktree = path.dirname(
-        await $`git rev-parse --path-format=absolute --git-common-dir`
-          .quiet()
-          .nothrow()
-          .cwd(worktree)
-          .text()
-          .then((x) => x.trim()),
-      )
+    const matches = Filesystem.up({ targets: [".git"], start: directory })
+    const git = await matches.next().then((x) => x.value)
+    await matches.return()
+    if (!git) {
       const project: Info = {
-        id,
-        worktree,
-        vcs: "git",
+        id: "global",
+        worktree: "/",
         time: {
           created: Date.now(),
         },
       }
-      await Storage.write<Info>(["project", id], project)
+      await Storage.write<Info>(["project", "global"], project)
       return project
     }
-    if (cache.has(directory)) {
-      return cache.get(directory)!
+    let worktree = path.dirname(git)
+    const [id] = await $`git rev-list --max-parents=0 --all`
+      .quiet()
+      .nothrow()
+      .cwd(worktree)
+      .text()
+      .then((x) =>
+        x
+          .split("\n")
+          .filter(Boolean)
+          .map((x) => x.trim())
+          .toSorted(),
+      )
+    if (!id) {
+      const project: Info = {
+        id: "global",
+        worktree: "/",
+        time: {
+          created: Date.now(),
+        },
+      }
+      await Storage.write<Info>(["project", "global"], project)
+      return project
     }
-    const result = await fn()
-    cache.set(directory, result)
-    return result
+    worktree = path.dirname(
+      await $`git rev-parse --path-format=absolute --git-common-dir`
+        .quiet()
+        .nothrow()
+        .cwd(worktree)
+        .text()
+        .then((x) => x.trim()),
+    )
+    const project: Info = {
+      id,
+      worktree,
+      vcs: "git",
+      time: {
+        created: Date.now(),
+      },
+    }
+    await Storage.write<Info>(["project", id], project)
+    return project
   }
 
   export async function setInitialized(projectID: string) {