fix: use path normalization to fix win32 issues

Author: pschiel

packages/app/e2e/fixtures.ts

@@ -85,3 +85,14 @@ async function seedStorage(page: Page, input: { directory: string; extra?: strin
 }
 
 export { expect }
+
+/**
+ * Check if KILO credentials are available for tests requiring connected providers.
+ * Model picker tests require connected providers which need these credentials.
+ * @returns true if credentials are missing
+ */
+export function missingKiloCredentials() {
+  const hasKey = !!process.env.KILO_API_KEY
+  const hasOrg = !!process.env.KILO_ORG_ID
+  return !hasKey || !hasOrg
+}

packages/app/e2e/models/models-visibility.spec.ts

@@ -1,8 +1,9 @@
-import { test, expect } from "../fixtures"
+import { test, expect, missingKiloCredentials } from "../fixtures"
 import { promptSelector } from "../selectors"
 import { closeDialog, openSettings, clickListItem } from "../actions"
 
 test("hiding a model removes it from the model picker", async ({ page, gotoSession }) => {
+  test.skip(missingKiloCredentials(), "KILO_API_KEY or KILO_ORG_ID not set")
   await gotoSession()
 
   await page.locator(promptSelector).click()

packages/app/e2e/settings/settings-models.spec.ts

@@ -1,8 +1,9 @@
-import { test, expect } from "../fixtures"
+import { test, expect, missingKiloCredentials } from "../fixtures"
 import { promptSelector } from "../selectors"
 import { closeDialog, openSettings } from "../actions"
 
 test("hiding a model removes it from the model picker", async ({ page, gotoSession }) => {
+  test.skip(missingKiloCredentials(), "KILO_API_KEY or KILO_ORG_ID not set")
   await gotoSession()
 
   await page.locator(promptSelector).click()
@@ -61,6 +62,7 @@ test("hiding a model removes it from the model picker", async ({ page, gotoSessi
 })
 
 test("showing a hidden model restores it to the model picker", async ({ page, gotoSession }) => {
+  test.skip(missingKiloCredentials(), "KILO_API_KEY or KILO_ORG_ID not set")
   await gotoSession()
 
   await page.locator(promptSelector).click()

packages/app/src/custom-elements.d.ts

@@ -0,0 +1,18 @@
+// kilocode_change - copy content instead of symlink for Windows compatibility
+import { DIFFS_TAG_NAME } from "@pierre/diffs"
+
+/**
+ * TypeScript declaration for the <diffs-container> custom element.
+ * This tells TypeScript that <diffs-container> is a valid JSX element in SolidJS.
+ * Required for using the @pierre/diffs web component in .tsx files.
+ */
+
+declare module "solid-js" {
+  namespace JSX {
+    interface IntrinsicElements {
+      [DIFFS_TAG_NAME]: HTMLAttributes<HTMLElement>
+    }
+  }
+}
+
+export {}

packages/app/src/custom-elements.d.ts

@@ -24,6 +24,7 @@ import { Plugin } from "@/plugin"
 import { Skill } from "../skill"
 
 import { Telemetry } from "@kilocode/kilo-telemetry" // kilocode_change
+import { Filesystem } from "@/util/filesystem"
 
 export namespace Agent {
   export const Info = z
@@ -106,12 +107,12 @@ export namespace Agent {
             question: "allow",
             plan_exit: "allow",
             external_directory: {
-              [path.join(Global.Path.data, "plans", "*")]: "allow",
+              [Filesystem.join(Global.Path.data, "plans", "*")]: "allow",
             },
             edit: {
               "*": "deny",
-              [path.join(".opencode", "plans", "*.md")]: "allow",
-              [path.relative(Instance.worktree, path.join(Global.Path.data, path.join("plans", "*.md")))]: "allow",
+              [Filesystem.join(".opencode", "plans", "*.md")]: "allow",
+              [Filesystem.relative(Instance.worktree, Filesystem.join(Global.Path.data, "plans", "*.md"))]: "allow",
             },
           }),
           user,

packages/opencode/src/agent/agent.ts

@@ -857,7 +857,7 @@ export function Session() {
           } else {
             const exportDir = process.cwd()
             const filename = options.filename.trim()
-            const filepath = path.join(exportDir, filename)
+            const filepath = Filesystem.join(exportDir, filename)
 
             await Bun.write(filepath, transcript)
 
@@ -1675,7 +1675,7 @@ function Bash(props: ToolProps<typeof BashTool>) {
     const base = sync.data.path.directory
     if (!base) return undefined
 
-    const absolute = path.resolve(base, workdir)
+    const absolute = Filesystem.resolve(base, workdir)
     if (absolute === base) return undefined
 
     const home = Global.Path.home
@@ -1730,7 +1730,7 @@ function Write(props: ToolProps<typeof WriteTool>) {
   })
 
   const diagnostics = createMemo(() => {
-    const filePath = Filesystem.normalizePath(props.input.filePath ?? "")
+    const filePath = Filesystem.realpath(props.input.filePath ?? "")
     return props.metadata.diagnostics?.[filePath] ?? []
   })
 
@@ -1940,7 +1940,7 @@ function Edit(props: ToolProps<typeof EditTool>) {
   const diffContent = createMemo(() => props.metadata.diff)
 
   const diagnostics = createMemo(() => {
-    const filePath = Filesystem.normalizePath(props.input.filePath ?? "")
+    const filePath = Filesystem.realpath(props.input.filePath ?? "")
     const arr = props.metadata.diagnostics?.[filePath] ?? []
     return arr.filter((x) => x.severity === 1).slice(0, 3)
   })
@@ -2133,7 +2133,7 @@ function Skill(props: ToolProps<typeof SkillTool>) {
 function normalizePath(input?: string) {
   if (!input) return ""
   if (path.isAbsolute(input)) {
-    return path.relative(process.cwd(), input) || "."
+    return Filesystem.relative(process.cwd(), input) || "."
   }
   return input
 }

packages/opencode/src/cli/cmd/tui/routes/session/index.tsx

@@ -15,6 +15,7 @@ import { Keybind } from "@/util/keybind"
 import { Locale } from "@/util/locale"
 import { Global } from "@/global"
 import { useDialog } from "../../ui/dialog"
+import { Filesystem } from "@/util/filesystem"
 
 type PermissionStage = "permission" | "always" | "reject"
 
@@ -23,8 +24,8 @@ function normalizePath(input?: string) {
 
   const cwd = process.cwd()
   const home = Global.Path.home
-  const absolute = path.isAbsolute(input) ? input : path.resolve(cwd, input)
-  const relative = path.relative(cwd, absolute)
+  const absolute = path.isAbsolute(input) ? input : Filesystem.resolve(cwd, input)
+  const relative = Filesystem.relative(cwd, absolute)
 
   if (!relative) return "."
   if (!relative.startsWith("..")) return relative
@@ -248,7 +249,7 @@ export function PermissionPrompt(props: { request: PermissionRequest }) {
                       const derived =
                         typeof pattern === "string"
                           ? pattern.includes("*")
-                            ? path.dirname(pattern)
+                            ? Filesystem.dirname(pattern)
                             : pattern
                           : undefined
 

packages/opencode/src/cli/cmd/tui/routes/session/permission.tsx

@@ -411,10 +411,13 @@ export namespace Config {
   }
 
   function rel(item: string, patterns: string[]) {
+    // Normalize the item path first
+    const normalizedItem = Filesystem.normalize(item)
     for (const pattern of patterns) {
-      const index = item.indexOf(pattern)
+      const normalizedPattern = Filesystem.normalize(pattern)
+      const index = normalizedItem.indexOf(normalizedPattern)
       if (index === -1) continue
-      return item.slice(index + pattern.length)
+      return normalizedItem.slice(index + normalizedPattern.length)
     }
   }
 

packages/opencode/src/config/config.ts

@@ -1,4 +1,4 @@
-import { sep } from "node:path"
+import { Filesystem } from "../util/filesystem"
 
 export namespace FileIgnore {
   const FOLDERS = new Set([
@@ -64,18 +64,20 @@ export namespace FileIgnore {
       whitelist?: Bun.Glob[]
     },
   ) {
+    const normalizedPath = Filesystem.normalize(filepath)
+
     for (const glob of opts?.whitelist || []) {
-      if (glob.match(filepath)) return false
+      if (glob.match(normalizedPath)) return false
     }
 
-    const parts = filepath.split(sep)
+    const parts = normalizedPath.split("/")
     for (let i = 0; i < parts.length; i++) {
       if (FOLDERS.has(parts[i])) return true
     }
 
     const extra = opts?.extra || []
     for (const glob of [...FILE_GLOBS, ...extra]) {
-      if (glob.match(filepath)) return true
+      if (glob.match(normalizedPath)) return true
     }
 
     return false