@astrofoundry/pi-astro 0.7.0 → 0.8.0

package/extensions/gemini-image/index.test.ts

@@ -1,4 +1,4 @@
-import { mkdtempSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
@@ -131,7 +131,7 @@ describe("gemini-image extension", () => {
         expect((res.content as Array<{ type: string }>)[1].type).toBe("image");
     });
 
-    it("always saves to <cwd>/.gemini-images by default", async () => {
+    it("saves under <cwd>/.gemini-images/<YYYY-MM-DD>/ with a zero-padded counter prefix by default", async () => {
         pngImageResponse();
         const { tool } = await load();
         const res = await tool.execute(
@@ -143,11 +143,14 @@ describe("gemini-image extension", () => {
         );
         const paths = res.details.savedPaths as string[];
         expect(paths).toHaveLength(1);
-        expect(paths[0]).toContain(".gemini-images");
-        expect(readdirSync(join(fakeCwd, ".gemini-images"))).toHaveLength(1);
+        const today = new Date().toISOString().slice(0, 10);
+        const dayDir = join(fakeCwd, ".gemini-images", today);
+        expect(paths[0]).toBe(join(dayDir, "000-a-thing.png"));
+        expect(readdirSync(join(fakeCwd, ".gemini-images"))).toEqual([today]);
+        expect(readdirSync(dayDir)).toEqual(["000-a-thing.png"]);
     });
 
-    it("save_to override writes into that directory (resolved against cwd)", async () => {
+    it("save_to override writes into <save_to>/<YYYY-MM-DD>/NNN-*.png", async () => {
         pngImageResponse();
         const { tool } = await load();
         const res = await tool.execute(
@@ -158,7 +161,79 @@ describe("gemini-image extension", () => {
             makeCtx({ cwd: fakeCwd }),
         );
         const paths = res.details.savedPaths as string[];
-        expect(paths[0]).toContain(join(fakeCwd, "out"));
+        const today = new Date().toISOString().slice(0, 10);
+        expect(paths[0]).toBe(join(fakeCwd, "out", today, "000-x.png"));
+    });
+
+    it("second call on the same day increments the counter (000 -> 001)", async () => {
+        pngImageResponse();
+        const { tool } = await load();
+        const first = await tool.execute(
+            "t",
+            { prompt: "alpha", skip_confirm: true },
+            undefined,
+            undefined,
+            makeCtx({ cwd: fakeCwd }),
+        );
+        pngImageResponse();
+        const second = await tool.execute(
+            "t",
+            { prompt: "beta", skip_confirm: true },
+            undefined,
+            undefined,
+            makeCtx({ cwd: fakeCwd }),
+        );
+        const today = new Date().toISOString().slice(0, 10);
+        const dayDir = join(fakeCwd, ".gemini-images", today);
+        expect((first.details.savedPaths as string[])[0]).toBe(join(dayDir, "000-alpha.png"));
+        expect((second.details.savedPaths as string[])[0]).toBe(join(dayDir, "001-beta.png"));
+    });
+
+    it("counter resumes from max existing NNN prefix even if earlier entries were deleted", async () => {
+        const today = new Date().toISOString().slice(0, 10);
+        const dayDir = join(fakeCwd, ".gemini-images", today);
+        mkdirSync(dayDir, { recursive: true });
+        writeFileSync(join(dayDir, "042-earlier.png"), "existing");
+        pngImageResponse();
+        const { tool } = await load();
+        const res = await tool.execute(
+            "t",
+            { prompt: "gamma", skip_confirm: true },
+            undefined,
+            undefined,
+            makeCtx({ cwd: fakeCwd }),
+        );
+        expect((res.details.savedPaths as string[])[0]).toBe(join(dayDir, "043-gamma.png"));
+    });
+
+    it("multi-image call (Imagen) gets consecutive counters within the same call", async () => {
+        generateImagesMock.mockResolvedValue({
+            generatedImages: [
+                { image: { imageBytes: "A", mimeType: "image/png" } },
+                { image: { imageBytes: "B", mimeType: "image/png" } },
+                { image: { imageBytes: "C", mimeType: "image/png" } },
+            ],
+        });
+        const { tool } = await load();
+        const res = await tool.execute(
+            "t",
+            {
+                prompt: "batch",
+                model: "imagen-4.0-fast-generate-001",
+                number_of_images: 3,
+                skip_confirm: true,
+            },
+            undefined,
+            undefined,
+            makeCtx({ cwd: fakeCwd }),
+        );
+        const today = new Date().toISOString().slice(0, 10);
+        const dayDir = join(fakeCwd, ".gemini-images", today);
+        expect(res.details.savedPaths).toEqual([
+            join(dayDir, "000-batch.png"),
+            join(dayDir, "001-batch.png"),
+            join(dayDir, "002-batch.png"),
+        ]);
     });
 
     it("silently saves API key on first paste (no confirm prompt)", async () => {

package/extensions/gemini-image/index.ts

@@ -1,4 +1,4 @@
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { join, resolve } from "node:path";
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 import type { AgentToolResult } from "@mariozechner/pi-agent-core";
@@ -51,7 +51,9 @@ const params = Type.Object({
         }),
     ),
     save_to: Type.Optional(
-        Type.String({ description: `Directory to save PNG(s). Default: <cwd>/${DEFAULT_SAVE_SUBDIR}/.` }),
+        Type.String({
+            description: `Base directory to save PNG(s). Images are written to <save_to>/YYYY-MM-DD/NNN-<slug>.png where NNN is a zero-padded counter that resumes from the highest existing prefix in that day's folder. Default base: <cwd>/${DEFAULT_SAVE_SUBDIR}/.`,
+        }),
     ),
     skip_confirm: Type.Optional(Type.Boolean({ description: "Skip the review/confirm prompt and call the API directly." })),
 });
@@ -219,22 +221,42 @@ async function callImagen(
     return { images };
 }
 
-function saveImages(images: DecodedImage[], dir: string, prompt: string): string[] {
+function todayFolderName(): string {
+    return new Date().toISOString().slice(0, 10);
+}
+
+function nextCounter(dir: string): number {
+    const existing = readdirSync(dir);
+    let max = -1;
+    for (const name of existing) {
+        const match = /^(\d{3,})-/.exec(name);
+        if (!match) continue;
+        const n = parseInt(match[1], 10);
+        if (n > max) max = n;
+    }
+    return max + 1;
+}
+
+function saveImages(images: DecodedImage[], baseDir: string, prompt: string): string[] {
+    const dir = join(baseDir, todayFolderName());
     mkdirSync(dir, { recursive: true });
+
     const slug =
         prompt
             .toLowerCase()
             .replace(/[^a-z0-9]+/g, "-")
             .replace(/^-+|-+$/g, "")
             .slice(0, 40) || "image";
-    const ts = new Date().toISOString().replace(/[:.]/g, "-");
+
+    let counter = nextCounter(dir);
     const paths: string[] = [];
-    for (let i = 0; i < images.length; i++) {
-        const ext = images[i].mimeType === "image/jpeg" ? "jpg" : "png";
-        const base = images.length > 1 ? `${slug}-${ts}-${i + 1}.${ext}` : `${slug}-${ts}.${ext}`;
-        const full = join(dir, base);
-        writeFileSync(full, Buffer.from(images[i].data, "base64"));
+    for (const img of images) {
+        const ext = img.mimeType === "image/jpeg" ? "jpg" : "png";
+        const prefix = String(counter).padStart(3, "0");
+        const full = join(dir, `${prefix}-${slug}.${ext}`);
+        writeFileSync(full, Buffer.from(img.data, "base64"));
         paths.push(full);
+        counter++;
     }
     return paths;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrofoundry/pi-astro",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Personal pi customizations (extensions, skills, prompts, themes) for the pi coding agent.",
   "keywords": [
     "pi-package"