shadow-claw 1.23.3 → 1.23.4

package/src/components/shadow-claw-files/shadow-claw-files.ts

@@ -1,5 +1,8 @@
+import { CONFIG_KEYS } from "../../config/config.js";
 import { effect } from "../../core/effect.js";
 import { getDb } from "../../db/db.js";
+import { getConfig } from "../../db/getConfig.js";
+import { isTruthyConfigValue } from "../../common/utils/config-value.mjs";
 
 import { setSanitizedHtml } from "../../security/trusted-types.js";
 import { copyGroupEntry } from "../../storage/copyGroupEntry.js";
@@ -1575,34 +1578,195 @@ export class ShadowClawFiles extends ShadowClawElement {
     return false;
   }
 
+  async promptUploadConflict(
+    fileName: string,
+    existingNames: Set<string>,
+  ): Promise<
+    { action: "overwrite" } | { action: "rename"; name: string } | null
+  > {
+    const root = this.shadowRoot;
+    if (!root) {
+      return null;
+    }
+
+    const dialog = root.querySelector(".files__upload-conflict-dialog");
+    const messageEl = root.querySelector(".files__upload-conflict-message");
+    const renameInput = root.querySelector(
+      ".files__upload-conflict-rename-input",
+    );
+    const form = root.querySelector(".files__upload-conflict-form");
+    const cancelBtn = root.querySelector(".files__upload-conflict-cancel");
+    const overwriteBtn = root.querySelector(
+      ".files__upload-conflict-overwrite",
+    );
+
+    if (
+      !(dialog instanceof HTMLDialogElement) ||
+      !(form instanceof HTMLFormElement) ||
+      !(renameInput instanceof HTMLInputElement)
+    ) {
+      return null;
+    }
+
+    const targetDirName =
+      orchestratorStore.currentPath === "."
+        ? "Root"
+        : orchestratorStore.currentPath;
+
+    if (messageEl instanceof HTMLElement) {
+      messageEl.textContent = `"${fileName}" already exists in "${targetDirName}". Please rename or choose to overwrite.`;
+    }
+
+    renameInput.value = fileName;
+
+    return new Promise((resolve) => {
+      let resolved = false;
+
+      const cleanup = () => {
+        form.removeEventListener("submit", handleSubmit);
+        cancelBtn?.removeEventListener("click", handleCancel);
+        overwriteBtn?.removeEventListener("click", handleOverwrite);
+        dialog.removeEventListener("cancel", handleCancel);
+        dialog.removeEventListener("close", handleClose);
+      };
+
+      const finish = (
+        result:
+          | { action: "overwrite" }
+          | { action: "rename"; name: string }
+          | null,
+      ) => {
+        if (resolved) {
+          return;
+        }
+        resolved = true;
+        cleanup();
+        if (typeof dialog.close === "function") {
+          dialog.close();
+        } else {
+          dialog.removeAttribute("open");
+        }
+        resolve(result);
+      };
+
+      const handleSubmit = (event: Event) => {
+        event.preventDefault();
+        const nextName = renameInput.value.trim();
+        if (!nextName) {
+          showWarning("Please enter a name", 3000);
+          return;
+        }
+
+        if (nextName.includes("/") || nextName.includes("\\")) {
+          showWarning("Use only a name, not a path", 3500);
+          return;
+        }
+
+        if (existingNames.has(nextName) || existingNames.has(`${nextName}/`)) {
+          showWarning(
+            `"${nextName}" already exists. Please choose a different name.`,
+            4000,
+          );
+          renameInput.select();
+          return;
+        }
+
+        finish({ action: "rename", name: nextName });
+      };
+
+      const handleOverwrite = (event: Event) => {
+        event.preventDefault();
+        finish({ action: "overwrite" });
+      };
+
+      const handleCancel = (event: Event) => {
+        event.preventDefault();
+        finish(null);
+      };
+
+      const handleClose = () => {
+        finish(null);
+      };
+
+      form.addEventListener("submit", handleSubmit);
+      cancelBtn?.addEventListener("click", handleCancel);
+      overwriteBtn?.addEventListener("click", handleOverwrite);
+      dialog.addEventListener("cancel", handleCancel);
+      dialog.addEventListener("close", handleClose);
+
+      if (typeof dialog.showModal === "function") {
+        dialog.showModal();
+      } else {
+        dialog.setAttribute("open", "");
+      }
+      renameInput.select();
+    });
+  }
+
   async uploadFileList(db: ShadowClawDatabase, files: FileList | File[]) {
     const fileList: File[] = Array.from(files) as File[];
     if (fileList.length === 0) {
       return;
     }
 
+    const appendUlid = await getConfig(db, CONFIG_KEYS.FILES_UPLOAD_APPEND_ULID)
+      .then((val) => isTruthyConfigValue(val, false))
+      .catch(() => false);
+
     const groupId = orchestratorStore.activeGroupId;
     const currentPath = orchestratorStore.currentPath;
     const count = fileList.length;
 
     filesUiStore.startUpload(count);
 
+    const existingNames = new Set(orchestratorStore.files);
+    let uploadedCount = 0;
+
     try {
       for (let i = 0; i < count; i++) {
         const file = fileList[i];
-        const filename =
-          currentPath === "."
-            ? `${ulid()}-${file.name}`
-            : `${currentPath}/${ulid()}-${file.name}`;
+        let filename = appendUlid ? `${ulid()}-${file.name}` : file.name;
+
+        const hasConflict =
+          existingNames.has(filename) || existingNames.has(`${filename}/`);
+
+        if (hasConflict) {
+          const decision = await this.promptUploadConflict(
+            filename,
+            existingNames,
+          );
+          if (!decision) {
+            filesUiStore.setUploadCompleted(i + 1);
+            continue;
+          }
 
-        await uploadGroupFile(db, groupId, filename, file);
+          if (decision.action === "rename") {
+            filename = decision.name;
+          } else if (decision.action === "overwrite") {
+            const targetPath =
+              currentPath === "." ? filename : `${currentPath}/${filename}`;
+            await this.removePageAssignmentIfNeeded(db, targetPath);
+          }
+        }
+
+        const fullPath =
+          currentPath === "." ? filename : `${currentPath}/${filename}`;
+
+        await uploadGroupFile(db, groupId, fullPath, file);
+        existingNames.add(filename);
+        uploadedCount++;
         filesUiStore.setUploadCompleted(i + 1);
       }
 
       // Reload files
       await orchestratorStore.loadFiles(db);
 
-      showSuccess(`Uploaded ${count} file${count === 1 ? "" : "s"}`, 3000);
+      if (uploadedCount > 0) {
+        showSuccess(
+          `Uploaded ${uploadedCount} file${uploadedCount === 1 ? "" : "s"}`,
+          3000,
+        );
+      }
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
 

package/src/components/shadow-claw-pages/utils/resolveWorkspaceLinkPath.test.ts

@@ -36,6 +36,37 @@ describe("resolveWorkspaceLinkPath", () => {
     expect(result).toBe("docs/guide.md");
   });
 
+  it("resolves relative image link in file directory", () => {
+    const result = resolveWorkspaceLinkPath(
+      "01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg",
+      "index.md",
+      groupId,
+      origin,
+    );
+    expect(result).toBe("01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg");
+  });
+
+  it("resolves relative links when subpath base tag is active", () => {
+    document.querySelectorAll("base").forEach((el) => el.remove());
+    const baseEl = document.createElement("base");
+    baseEl.setAttribute("href", "/shadow-claw/");
+    document.head.appendChild(baseEl);
+    (globalThis as any).__applyBasePathCacheReset?.();
+
+    try {
+      const result = resolveWorkspaceLinkPath(
+        "01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg",
+        "index.md",
+        groupId,
+        origin,
+      );
+      expect(result).toBe("01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg");
+    } finally {
+      baseEl.remove();
+      (globalThis as any).__applyBasePathCacheReset?.();
+    }
+  });
+
   it("returns null if link points to external origin", () => {
     const result = resolveWorkspaceLinkPath(
       "https://example.com/page",

package/src/components/shadow-claw-pages/utils/resolveWorkspaceLinkPath.ts

@@ -1,4 +1,5 @@
 import {
+  applyBasePath,
   getFileRouteDirPath,
   getWorkspaceRouteRequestPath,
   resolveHrefAgainstRoute,
@@ -43,7 +44,7 @@ export function resolveWorkspaceLinkPath(
     }
   }
 
-  const routeDir = getFileRouteDirPath(groupId, filePath);
+  const routeDir = applyBasePath(getFileRouteDirPath(groupId, filePath));
   const resolved = resolveHrefAgainstRoute(
     trimmed,
     routeDir,

package/src/components/shadow-claw-pages/utils/rewriteWorkspacePreviewHtml.test.ts

@@ -42,4 +42,19 @@ describe("rewriteWorkspacePreviewHtml", () => {
     );
     expect(rewritten).toContain('href="https://example.com/docs"');
   });
+
+  it("rewrites relative markdown links to subpath-prefixed workspace routes", () => {
+    const html =
+      '<p><a href="01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg">01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg</a></p>';
+    const rewritten = rewriteWorkspacePreviewHtml(
+      html,
+      "index.md",
+      "/shadow-claw/files/br:main/",
+      groupId,
+      origin,
+    );
+    expect(rewritten).toContain(
+      'href="/shadow-claw/files/br:main/01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg"',
+    );
+  });
 });

package/src/config/config.test.ts

@@ -12,6 +12,7 @@ import {
   DEFAULT_DEV_HOST,
   DEFAULT_DEV_IP,
   DEFAULT_DEV_PORT,
+  DEFAULT_FILES_UPLOAD_APPEND_ULID,
   DEFAULT_GROUP_ID,
   DEFAULT_MAX_TOKENS,
   DEFAULT_PROMPT_API_BACKEND,
@@ -149,6 +150,10 @@ describe("config.js", () => {
       expect(DEFAULT_TRANSFORMERS_JS_BACKEND).toBe("auto");
       expect(DEFAULT_TRANSFORMERS_JS_DTYPE_STRATEGY).toBe("auto");
     });
+
+    it("should have valid DEFAULT_FILES_UPLOAD_APPEND_ULID", () => {
+      expect(DEFAULT_FILES_UPLOAD_APPEND_ULID).toBe(false);
+    });
   });
 
   describe("buildTriggerPattern", () => {
@@ -425,6 +430,10 @@ describe("config.js", () => {
       );
       expect(CONFIG_KEYS.CHANNEL_ENABLED_PREFIX).toBe("channel_enabled:");
       expect(CONFIG_KEYS.CHAT_INPUT_AREA_HEIGHT).toBe("chat_input_area_height");
+      expect(CONFIG_KEYS.ENABLED_TOOLS).toBe("enabled_tools");
+      expect(CONFIG_KEYS.FILES_UPLOAD_APPEND_ULID).toBe(
+        "files_upload_append_ulid",
+      );
       expect(CONFIG_KEYS.GIT_AUTHOR_EMAIL).toBe("git_author_email");
       expect(CONFIG_KEYS.GIT_AUTHOR_NAME).toBe("git_author_name");
       expect(CONFIG_KEYS.GIT_CORS_PROXY).toBe("git_cors_proxy");

package/src/config/config.ts

@@ -1042,6 +1042,7 @@ export const CONFIG_KEYS = {
   DEFAULT_PINNED_PAGE: "default_pinned_page",
   DIRECT_TOOL_COMMAND_POLICY: "direct_tool_command_policy",
   ENABLED_TOOLS: "enabled_tools",
+  FILES_UPLOAD_APPEND_ULID: "files_upload_append_ulid",
   GIT_ACCOUNTS: "git_accounts",
   GIT_AUTHOR_EMAIL: "git_author_email",
   GIT_AUTHOR_NAME: "git_author_name",
@@ -1073,6 +1074,7 @@ export const CONFIG_KEYS = {
   MESH_LLM_HOST: "mesh_llm_host",
   MODEL: "model",
   OAUTH_PROVIDER_DEFINITIONS: "oauth_provider_definitions",
+  OPFS_MIGRATED_FROM_LEGACY: "opfs_migrated_from_legacy",
   OVERRIDE_PRERENDER_SKELETON: "override_prerender_skeleton",
   PAGES_AUTO_REFRESH_INTERVAL: "pages_auto_refresh_interval",
   PAGES_LIST: "pages_list",
@@ -1180,3 +1182,6 @@ export const DEFAULT_TASK_SERVER_URL = "http://localhost:8888/schedule";
 
 /** Default Task Server Enabled */
 export const DEFAULT_TASK_SERVER_ENABLED = false;
+
+/** Default Files Upload Append ULID */
+export const DEFAULT_FILES_UPLOAD_APPEND_ULID = false;

package/src/core/app-routes.test.ts

@@ -5,6 +5,7 @@ import {
   getDeploymentNamespace,
   getFileRouteDirPath,
   getWorkspaceRouteRequestPath,
+  isPossibleAppRoute,
   parseRouteFromUrl,
   resolveHrefAgainstRoute,
 } from "./app-routes.js";
@@ -148,11 +149,17 @@ describe("app-routes", () => {
   describe("applyBasePath", () => {
     // Reset cached base path between tests
     beforeEach(() => {
+      document.querySelectorAll("base").forEach((el) => el.remove());
       // Force-reset the module-level cache so each sub-test starts fresh.
       // We do this by temporarily reassigning window.location via jsdom.
       (globalThis as any).__applyBasePathCacheReset?.();
     });
 
+    afterEach(() => {
+      document.querySelectorAll("base").forEach((el) => el.remove());
+      (globalThis as any).__applyBasePathCacheReset?.();
+    });
+
     it("returns path unchanged when base is root", () => {
       // In jsdom the default base path resolves to "/"
       expect(applyBasePath("/chat")).toBe("/chat");
@@ -191,6 +198,55 @@ describe("app-routes", () => {
         anchor: undefined,
       });
     });
+
+    it("handles explicit subpath <base href> tag correctly for all workspace routes", () => {
+      document.querySelectorAll("base").forEach((el) => el.remove());
+      const baseEl = document.createElement("base");
+      baseEl.setAttribute("href", "/shadow-claw/");
+      document.head.appendChild(baseEl);
+      (globalThis as any).__applyBasePathCacheReset?.();
+
+      try {
+        expect(getAppBasePath()).toBe("/shadow-claw/");
+
+        // Workspace file route extraction with subpath prefix
+        expect(
+          getWorkspaceRouteRequestPath(
+            "/shadow-claw/files/main/01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg",
+          ),
+        ).toEqual({
+          groupId: "br:main",
+          path: "01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg",
+        });
+
+        // isPossibleAppRoute validation
+        expect(
+          isPossibleAppRoute(
+            "/shadow-claw/files/main/01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg",
+          ),
+        ).toBe(true);
+
+        // Path without base prefix should NOT match app routes
+        expect(
+          isPossibleAppRoute(
+            "/files/main/01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg",
+          ),
+        ).toBe(false);
+
+        // resolveHrefAgainstRoute with subpath routeDir
+        const resolved = resolveHrefAgainstRoute(
+          "01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg",
+          applyBasePath(getFileRouteDirPath("br:main", "index.md")),
+          "http://localhost",
+        );
+        expect(resolved?.pathname).toBe(
+          "/shadow-claw/files/main/01M1A1R4Y708YJNPGV2NHQKYF7-IMG_0233.jpeg",
+        );
+      } finally {
+        baseEl.remove();
+        (globalThis as any).__applyBasePathCacheReset?.();
+      }
+    });
   });
 
   describe("pretty path routing", () => {

package/src/core/app-routes.ts

@@ -551,7 +551,14 @@ export function getFileRouteDirPath(groupId: string, filePath: string): string {
 export function getWorkspaceRouteRequestPath(
   pathname: string,
 ): { groupId: string; path: string } | null {
-  const parts = pathname
+  let relativePath = pathname;
+  const basePath = getAppBasePath();
+
+  if (basePath !== "/" && relativePath.startsWith(basePath)) {
+    relativePath = "/" + relativePath.slice(basePath.length);
+  }
+
+  const parts = relativePath
     .split("/")
     .filter(Boolean)
     .map((part) => decodePathSegment(part));

package/src/db/openDatabase.test.ts

@@ -2,8 +2,15 @@ import { jest } from "@jest/globals";
 
 const setDB = jest.fn();
 
+const mockMigrateLegacyDatabase = jest.fn<any>().mockResolvedValue(undefined);
+const mockMigrateLegacyOpfs = jest.fn<any>().mockResolvedValue(undefined);
+
 jest.unstable_mockModule("./migrateLegacyDatabase.js", () => ({
-  migrateLegacyDatabase: jest.fn<any>().mockResolvedValue(undefined),
+  migrateLegacyDatabase: mockMigrateLegacyDatabase,
+}));
+
+jest.unstable_mockModule("../storage/migrateLegacyOpfs.js", () => ({
+  migrateLegacyOpfs: mockMigrateLegacyOpfs,
 }));
 
 jest.unstable_mockModule("./db.js", () => ({
@@ -110,6 +117,8 @@ describe("openDatabase", () => {
     );
 
     expect(setDB).toHaveBeenCalledWith(database);
+    expect(mockMigrateLegacyDatabase).toHaveBeenCalledWith(database);
+    expect(mockMigrateLegacyOpfs).toHaveBeenCalledWith(database);
   });
 
   it("skips creating stores that already exist", async () => {

package/src/db/openDatabase.ts

@@ -1,6 +1,7 @@
 import { DB_VERSION, getDbName } from "../config/config.js";
 import { setDB } from "./db.js";
 import { migrateLegacyDatabase } from "./migrateLegacyDatabase.js";
+import { migrateLegacyOpfs } from "../storage/migrateLegacyOpfs.js";
 import type { ShadowClawDatabase } from "./types.js";
 
 /**
@@ -59,8 +60,9 @@ export function openDatabase(): Promise<ShadowClawDatabase> {
       setDB(db);
       try {
         await migrateLegacyDatabase(db);
+        await migrateLegacyOpfs(db);
       } catch (e) {
-        console.warn("Error running IndexedDB legacy migration:", e);
+        console.warn("Error running legacy migration:", e);
       }
       resolve(db);
     };