gemi 0.87.0 → 0.88.1

package/dist/bin/gemi.js

@@ -36002,10 +36002,10 @@ function extractAgent(ts, reference, { cwd = process.cwd(), name } = {}) {
   ].join(`
 `);
   const host = ts.createCompilerHost(options);
-  const { getSourceFile, fileExists, readFile } = host;
+  const { getSourceFile, fileExists, readFile: readFile2 } = host;
   host.getSourceFile = (fileName, languageVersion, ...rest) => fileName === probe ? ts.createSourceFile(fileName, source, languageVersion) : getSourceFile.call(host, fileName, languageVersion, ...rest);
   host.fileExists = (fileName) => fileName === probe || fileExists.call(host, fileName);
-  host.readFile = (fileName) => fileName === probe ? source : readFile.call(host, fileName);
+  host.readFile = (fileName) => fileName === probe ? source : readFile2.call(host, fileName);
   const second = ts.createProgram({ rootNames: [file, probe], options, host, oldProgram: first });
   const probeFile = second.getSourceFile(probe);
   const alias = (aliasName) => {
@@ -36067,8 +36067,8 @@ function exportedType(ts, checker, sourceFile, reference) {
   return { type: checker.getTypeOfSymbolAtLocation(symbol, sourceFile), name: symbol.getName() };
 }
 function specifier(from, to) {
-  const relative3 = path7.relative(path7.dirname(from), to).split(path7.sep).join("/").replace(/(\.d)?\.(ts|tsx|mts|cts)$/, "");
-  return relative3.startsWith(".") ? relative3 : `./${relative3}`;
+  const relative4 = path7.relative(path7.dirname(from), to).split(path7.sep).join("/").replace(/(\.d)?\.(ts|tsx|mts|cts)$/, "");
+  return relative4.startsWith(".") ? relative4 : `./${relative4}`;
 }
 function isFrameworkJsonValue(type) {
   const alias = type.aliasSymbol;
@@ -36282,8 +36282,8 @@ function renderKotlin(agent, packageName) {
   emit(`  AgentSchema<${agent.name}.ToolCall, ${agent.name}.ToolResult, ${agent.name}.Pending, ${kotlinType(agent.output, outside)}> {`);
   const hidden = new Set(classes);
   const owner = hidden.has(agent.name) ? `${packageName}.${agent.name}` : agent.name;
-  const inside = (name, namespace = owner) => hidden.has(name) ? `${namespace}.${name}` : name;
-  const chat = (name) => inside(name, "dev.gemijs.chat");
+  const inside2 = (name, namespace = owner) => hidden.has(name) ? `${namespace}.${name}` : name;
+  const chat = (name) => inside2(name, "dev.gemijs.chat");
   emit(`  override val outputSerializer: KSerializer<${output}>? = ${agent.output.kind === "never" ? "null" : `serializer<${output}>()`}`);
   const serializer = (type) => type.kind === "never" ? "null" : `serializer<${kotlinType(type)}>()`;
   const answer = (type) => type.kind === "never" ? { kind: "json" } : type;
@@ -36293,7 +36293,7 @@ function renderKotlin(agent, packageName) {
       raw: "ContentPart.ToolCall",
       rawInside: `${chat("ContentPart")}.ToolCall`,
       argument: "part",
-      typed: (tool) => `${chat("TypedToolCall")}<${kotlinType(tool.input, inside)}, ${kotlinType(tool.progress, inside)}>`,
+      typed: (tool) => `${chat("TypedToolCall")}<${kotlinType(tool.input, inside2)}, ${kotlinType(tool.progress, inside2)}>`,
       build: (tool) => `ToolCall.${tool.class}(TypedToolCall(part, ${serializer(tool.input)}, ${serializer(tool.progress)}))`
     },
     {
@@ -36301,7 +36301,7 @@ function renderKotlin(agent, packageName) {
       raw: "ContentPart.ToolResult",
       rawInside: `${chat("ContentPart")}.ToolResult`,
       argument: "part",
-      typed: (tool) => `${chat("TypedToolResult")}<${kotlinType(answer(tool.output), inside)}>`,
+      typed: (tool) => `${chat("TypedToolResult")}<${kotlinType(answer(tool.output), inside2)}>`,
       build: (tool) => `TypedToolResult.of(part, ${serializer(answer(tool.output))})?.let(ToolResult::${tool.class}) ?: ToolResult.Unknown(part)`
     },
     {
@@ -36309,7 +36309,7 @@ function renderKotlin(agent, packageName) {
       raw: "PendingToolCall",
       rawInside: chat("PendingToolCall"),
       argument: "call",
-      typed: (tool) => `${chat("TypedPendingCall")}<${kotlinType(tool.input, inside)}, ${kotlinType(answer(tool.output), inside)}>`,
+      typed: (tool) => `${chat("TypedPendingCall")}<${kotlinType(tool.input, inside2)}, ${kotlinType(answer(tool.output), inside2)}>`,
       build: (tool) => `Pending.${tool.class}(TypedPendingCall(call, ${serializer(tool.input)}, ${serializer(answer(tool.output))}))`
     }
   ];
@@ -36317,12 +36317,12 @@ function renderKotlin(agent, packageName) {
     emit();
     emit(`  public sealed interface ${view.name} {`);
     for (const tool of tools) {
-      emit(`    public data class ${tool.class}(val value: ${view.typed(tool)}) : ${inside(view.name)}`);
+      emit(`    public data class ${tool.class}(val value: ${view.typed(tool)}) : ${inside2(view.name)}`);
     }
     emit("");
     emit("    /** A tool this file does not know \u2014 added since it was generated, or a");
     emit("     *  skill \u2014 or a payload that no longer decodes. */");
-    emit(`    public data class Unknown(val value: ${view.rawInside}) : ${inside(view.name)}`);
+    emit(`    public data class Unknown(val value: ${view.rawInside}) : ${inside2(view.name)}`);
     emit("  }");
   }
   for (const view of views) {
@@ -36728,6 +36728,8 @@ var init_generate = __esm(() => {
 // bin/gemi.ts
 import path9 from "path";
 import { existsSync as existsSync8 } from "fs";
+import { mkdtemp, rm } from "fs/promises";
+import { tmpdir } from "os";
 
 // bin/createRollupInput.ts
 var {Glob } = globalThis.Bun;
@@ -40136,6 +40138,150 @@ var gemi = async () => {
 };
 var vite_default = gemi;
 
+// vite/previousAssets.ts
+import { copyFile, lstat, mkdir as mkdir2, readdir, readFile, stat, writeFile as writeFile2 } from "fs/promises";
+import { dirname as dirname2, isAbsolute, join as join4, relative, resolve, sep } from "path";
+var PREVIOUS_ASSETS_RECORD = ".vite/previous-assets.json";
+var DEFAULT_RETAINED_RELEASES = 2;
+var DEFAULT_RETAINED_MAX_AGE_SECONDS = 7 * 24 * 60 * 60;
+var ASSETS_DIR = "assets";
+function resolvePreviousAssets(configured, rootDir, env = process.env.GEMI_PREVIOUS_ASSETS) {
+  const fromEnv = env?.trim();
+  if (!fromEnv && !configured) {
+    return;
+  }
+  const config = typeof configured === "object" ? configured : {};
+  const from = fromEnv || config.from || join4("dist", "client");
+  const releases = config.releases ?? DEFAULT_RETAINED_RELEASES;
+  const maxAge = config.maxAge ?? DEFAULT_RETAINED_MAX_AGE_SECONDS;
+  if (!Number.isInteger(releases) || releases < 0) {
+    throw new Error(`previousAssets.releases must be a whole number \u2265 0, got ${releases}`);
+  }
+  if (!(maxAge >= 0)) {
+    throw new Error(`previousAssets.maxAge must be a number of seconds \u2265 0, got ${maxAge}`);
+  }
+  return {
+    from: isAbsolute(from) ? from : resolve(rootDir, from),
+    releases,
+    maxAgeMs: maxAge * 1000
+  };
+}
+async function stagePreviousAssets(options, stagingDir, now = new Date) {
+  const { from } = options;
+  if (!await isDirectory(join4(from, ASSETS_DIR))) {
+    console.log(`No previous assets at ${join4(from, ASSETS_DIR)}; nothing to carry over.`);
+    return [];
+  }
+  const carried = await readRecord(from);
+  const carriedFiles = new Set(carried.flatMap((release) => release.files));
+  const own = (await listFiles(from, ASSETS_DIR)).filter((file) => isCarriable(file) && !carriedFiles.has(file));
+  const releases = [
+    { retiredAt: now.toISOString(), files: own },
+    ...carried.filter((release) => now.getTime() - Date.parse(release.retiredAt) < options.maxAgeMs)
+  ].filter((release) => release.files.length > 0).slice(0, options.releases);
+  const kept = [];
+  for (const release of releases) {
+    const files = [];
+    for (const file of release.files) {
+      const source = isCarriable(file) ? inside(from, file) : null;
+      if (!source || !await isFile(source)) {
+        continue;
+      }
+      const target = join4(stagingDir, file);
+      await mkdir2(dirname2(target), { recursive: true });
+      await copyFile(source, target);
+      files.push(file);
+    }
+    if (files.length > 0) {
+      kept.push({ retiredAt: release.retiredAt, files });
+    }
+  }
+  return kept;
+}
+async function restorePreviousAssets(stagingDir, clientDir, releases) {
+  const record = [];
+  let count = 0;
+  for (const release of releases) {
+    const files = [];
+    for (const file of release.files) {
+      const target = inside(clientDir, file);
+      if (!target || await exists(target)) {
+        continue;
+      }
+      await mkdir2(dirname2(target), { recursive: true });
+      await copyFile(join4(stagingDir, file), target);
+      files.push(file);
+    }
+    if (files.length > 0) {
+      record.push({ retiredAt: release.retiredAt, files });
+      count += files.length;
+    }
+  }
+  const recordPath = join4(clientDir, PREVIOUS_ASSETS_RECORD);
+  await mkdir2(dirname2(recordPath), { recursive: true });
+  await writeFile2(recordPath, `${JSON.stringify({ releases: record }, null, 2)}
+`);
+  return { files: count, releases: record.length };
+}
+async function readRecord(clientDir) {
+  let raw;
+  try {
+    raw = await readFile(join4(clientDir, PREVIOUS_ASSETS_RECORD), "utf8");
+  } catch (error) {
+    if (error?.code === "ENOENT") {
+      return [];
+    }
+    throw error;
+  }
+  const releases = JSON.parse(raw)?.releases;
+  if (!Array.isArray(releases)) {
+    return [];
+  }
+  return releases.filter((release) => typeof release?.retiredAt === "string" && !Number.isNaN(Date.parse(release.retiredAt)) && Array.isArray(release.files) && release.files.every((file) => typeof file === "string"));
+}
+async function listFiles(root, dir) {
+  const files = [];
+  for (const entry of await readdir(join4(root, dir), { withFileTypes: true })) {
+    const path3 = `${dir}/${entry.name}`;
+    if (entry.isDirectory()) {
+      files.push(...await listFiles(root, path3));
+    } else if (entry.isFile()) {
+      files.push(path3);
+    }
+  }
+  return files;
+}
+function isCarriable(file) {
+  return !file.endsWith(".map") && !file.split("/").some((part) => part.startsWith("."));
+}
+function inside(root, file) {
+  const path3 = resolve(root, file);
+  const rel2 = relative(root, path3);
+  return rel2 && !rel2.startsWith("..") && !isAbsolute(rel2) && rel2.split(sep)[0] === ASSETS_DIR ? path3 : null;
+}
+async function isDirectory(path3) {
+  try {
+    return (await stat(path3)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+async function isFile(path3) {
+  try {
+    return (await lstat(path3)).isFile();
+  } catch {
+    return false;
+  }
+}
+async function exists(path3) {
+  try {
+    await stat(path3);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 // ../../node_modules/.bun/commander@12.1.0/node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
@@ -40154,26 +40300,26 @@ var {
 
 // bin/check-models.ts
 import { statSync as statSync2 } from "fs";
-import { relative as relative2, resolve } from "path";
+import { relative as relative3, resolve as resolve2 } from "path";
 
 // support/discover.ts
 import { existsSync as existsSync3, readdirSync as readdirSync2 } from "fs";
-import { join as join4, relative } from "path";
+import { join as join5, relative as relative2 } from "path";
 function sourceFiles(dir, ignore = []) {
   const out = [];
   const ignored = (path3) => {
-    const rel2 = relative(dir, path3).split("\\").join("/");
+    const rel2 = relative2(dir, path3).split("\\").join("/");
     return ignore.some((pattern) => rel2 === pattern || rel2.startsWith(`${pattern}/`));
   };
   const walk3 = (current) => {
     for (const entry of readdirSync2(current, { withFileTypes: true }).sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0)) {
-      const path3 = join4(current, entry.name);
+      const path3 = join5(current, entry.name);
       if (ignored(path3))
         continue;
       if (entry.isDirectory()) {
         if (entry.name.startsWith(".") || entry.name === "node_modules")
           continue;
-        if (existsSync3(join4(path3, "package.json")))
+        if (existsSync3(join5(path3, "package.json")))
           continue;
         walk3(path3);
         continue;
@@ -40250,7 +40396,7 @@ class CheckModelsError extends Error {
 async function namedModules(rootDir, paths) {
   const modules = [];
   for (const path3 of paths) {
-    const resolved = resolve(rootDir, path3);
+    const resolved = resolve2(rootDir, path3);
     try {
       modules.push(await import(resolved));
     } catch (error) {
@@ -40261,19 +40407,19 @@ async function namedModules(rootDir, paths) {
   return modules;
 }
 async function declaredModules(rootDir) {
-  const path3 = resolve(rootDir, "app/kernel/Kernel.ts");
+  const path3 = resolve2(rootDir, "app/kernel/Kernel.ts");
   let Kernel;
   try {
     ({ default: Kernel } = await import(path3));
   } catch (error) {
-    throw new CheckModelsError(`Could not load ${relative2(rootDir, path3)}:
+    throw new CheckModelsError(`Could not load ${relative3(rootDir, path3)}:
     ${error.message}`);
   }
   return new Kernel().models ?? [];
 }
 async function checkModels(options) {
-  const rootDir = resolve(options.rootDir);
-  const modelsDir = resolve(rootDir, options.modelsDir ?? "app/models");
+  const rootDir = resolve2(options.rootDir);
+  const modelsDir = resolve2(rootDir, options.modelsDir ?? "app/models");
   const ignore = options.ignore ?? [];
   let orm;
   try {
@@ -40319,8 +40465,8 @@ ${error.message}`);
   const paths = modelFiles(modelsDir, ignore);
   const files = [];
   for (const path3 of paths) {
-    const label = relative2(rootDir, path3);
-    const specifier = `./${relative2(modelsDir, path3).split("\\").join("/").replace(/\.tsx?$/, "")}`;
+    const label = relative3(rootDir, path3);
+    const specifier = `./${relative3(modelsDir, path3).split("\\").join("/").replace(/\.tsx?$/, "")}`;
     try {
       files.push({
         label,
@@ -40369,7 +40515,7 @@ function indent(message) {
 
 // bin/ide/generateApiManifest.ts
 var import_recast2 = __toESM(require_main2(), 1);
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import { existsSync as existsSync4 } from "fs";
 
 // utils/toCamelCase.ts
@@ -40421,7 +40567,7 @@ class ApiManifestGenerator {
   rootRouterBody;
   routerBodyCache = new Map;
   controllerCache = new Map;
-  manifestCacheDir = join5(ROOT, ".gemi/cache/api-routes-manifest");
+  manifestCacheDir = join6(ROOT, ".gemi/cache/api-routes-manifest");
   async writeManifest(cacheFilePath) {
     const manifest = {};
     for (const [routeName, method] of this.routes.entries()) {
@@ -40453,7 +40599,7 @@ class ApiManifestGenerator {
     if (path4.startsWith("@/app")) {
       return path4.replace("@", "") + ".ts";
     }
-    return join5(parentPath, path4) + ".ts";
+    return join6(parentPath, path4) + ".ts";
   }
   isFileShouldBeParsed(path4) {
     return path4.includes("app/http/router") || path4.includes("app/http/controllers");
@@ -40501,7 +40647,7 @@ class ApiManifestGenerator {
     if (normalizedPath.startsWith("/app/http/controllers")) {
       for (const specifier of node.specifiers) {
         const name = specifier.type === "ImportDefaultSpecifier" ? specifier.local.name : specifier.imported.name;
-        await this.parseControllerFile(await this.parseFile(join5(ROOT, normalizedPath)), name, normalizedPath);
+        await this.parseControllerFile(await this.parseFile(join6(ROOT, normalizedPath)), name, normalizedPath);
       }
     }
     if (normalizedPath.startsWith("/app/http/routes")) {
@@ -40605,7 +40751,7 @@ class ApiManifestGenerator {
   }
   async parse(cacheFilePath, filePath, isRoot = true, name = "") {
     console.log({ ROOT, filePath });
-    const file = await this.parseFile(join5(ROOT, filePath));
+    const file = await this.parseFile(join6(ROOT, filePath));
     for (const body of file.program.body) {
       if (!this.isNodeShouldBeParsed(body))
         continue;
@@ -40641,7 +40787,7 @@ class ApiManifestGenerator {
   }
   async run(filePath) {
     const cacheId = generateGitDiffId();
-    const cacheFilePath = join5(this.manifestCacheDir, `${cacheId}.json`);
+    const cacheFilePath = join6(this.manifestCacheDir, `${cacheId}.json`);
     if (existsSync4(cacheFilePath)) {
       console.log(await Bun.file(cacheFilePath).text());
     } else {
@@ -40853,11 +40999,11 @@ function hashDirectory(dir) {
     const entries = readdirSync3(current, { withFileTypes: true }).sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
     for (const entry of entries) {
       const full = path5.join(current, entry.name);
-      const relative3 = prefix ? `${prefix}/${entry.name}` : entry.name;
+      const relative4 = prefix ? `${prefix}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
-        walk3(full, relative3);
+        walk3(full, relative4);
       } else if (entry.isFile()) {
-        hash.update(relative3);
+        hash.update(relative4);
         hash.update("\x00");
         hash.update(readFileSync3(full));
         hash.update("\x00");
@@ -41195,12 +41341,25 @@ program.command("build").action(async () => {
   const config = await loadGemiConfig(rootDir);
   const input = await createRollupInput_default(appDir);
   process.env.GEMI_INPUT = JSON.stringify(input);
-  console.log("Building client...");
-  await build({
-    configFile: false,
-    plugins: [vite_default()],
-    build: { outDir: "dist/client" }
-  });
+  const previousAssets = resolvePreviousAssets(config.previousAssets, rootDir);
+  const stagingDir = previousAssets ? await mkdtemp(path9.join(tmpdir(), "gemi-previous-assets-")) : undefined;
+  try {
+    const retained = previousAssets && stagingDir ? await stagePreviousAssets(previousAssets, stagingDir) : [];
+    console.log("Building client...");
+    await build({
+      configFile: false,
+      plugins: [vite_default()],
+      build: { outDir: "dist/client" }
+    });
+    if (stagingDir) {
+      const carried = await restorePreviousAssets(stagingDir, path9.join(rootDir, "dist", "client"), retained);
+      console.log(`Kept ${carried.files} asset file(s) from ${carried.releases} earlier release(s).`);
+    }
+  } finally {
+    if (stagingDir) {
+      await rm(stagingDir, { recursive: true, force: true });
+    }
+  }
   console.log("Building server...");
   await build({
     configFile: false,
@@ -41356,5 +41515,5 @@ program.command("app:route-manifest").action(async () => {
 });
 program.parse();
 
-//# debugId=225CB52085F3B55064756E2164756E21
+//# debugId=5AAC40F8231D70BD64756E2164756E21
 //# sourceMappingURL=gemi.js.map