resolve merge conflicts

packages/plugin/script/publish.ts

@@ -6,17 +6,33 @@ import { fileURLToPath } from "url"
 const dir = fileURLToPath(new URL("..", import.meta.url))
 process.chdir(dir)
 
+async function published(name: string, version: string) {
+  return (await $`npm view ${name}@${version} version`.nothrow()).exitCode === 0
+}
+
 await $`bun tsc`
-const pkg = await import("../package.json").then((m) => m.default)
-const original = JSON.parse(JSON.stringify(pkg))
-for (const [key, value] of Object.entries(pkg.exports)) {
-  const file = value.replace("./src/", "./dist/").replace(".ts", "")
-  // @ts-ignore
-  pkg.exports[key] = {
-    import: file + ".js",
-    types: file + ".d.ts",
+const originalText = await Bun.file("package.json").text()
+const pkg = JSON.parse(originalText) as {
+  name: string
+  version: string
+  exports: Record<string, string>
+}
+if (await published(pkg.name, pkg.version)) {
+  console.log(`already published ${pkg.name}@${pkg.version}`)
+} else {
+  for (const [key, value] of Object.entries(pkg.exports)) {
+    const file = value.replace("./src/", "./dist/").replace(".ts", "")
+    // @ts-ignore
+    pkg.exports[key] = {
+      import: file + ".js",
+      types: file + ".d.ts",
+    }
+  }
+  await Bun.write("package.json", JSON.stringify(pkg, null, 2))
+  try {
+    await $`bun pm pack`
+    await $`npm publish *.tgz --tag ${Script.channel} --access public --provenance` // kilocode_change
+  } finally {
+    await Bun.write("package.json", originalText)
   }
 }
-await Bun.write("package.json", JSON.stringify(pkg, null, 2))
-await $`bun pm pack && npm publish *.tgz --tag ${Script.channel} --access public --provenance` // kilocode_change
-await Bun.write("package.json", JSON.stringify(original, null, 2))