kcode-pi 0.1.1 → 0.1.2

package/dist/cli/kcode.js

@@ -1,10 +1,11 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
 const packageRoot = dirname(dirname(dirname(fileURLToPath(import.meta.url))));
 const require = createRequire(import.meta.url);
+const packageName = readPackageName(packageRoot) ?? "kcode-pi";
 export function runKcodeCli(args, cwd = process.cwd()) {
     const command = args[0] ?? "help";
     switch (command) {
@@ -26,16 +27,14 @@ export function initProject(cwd) {
     const settingsPath = projectSettingsPath(cwd);
     const settings = readSettings(settingsPath);
     const kcodePackage = normalizePath(packageRoot);
-    const packages = settings.packages ?? [];
-    if (!packages.includes(kcodePackage)) {
-        packages.unshift(kcodePackage);
-    }
+    const packages = (settings.packages ?? []).filter((pkg) => !isSameKcodePackage(pkg, kcodePackage));
+    packages.unshift(kcodePackage);
     settings.packages = packages;
     mkdirSync(dirname(settingsPath), { recursive: true });
     writeFileSync(settingsPath, `${JSON.stringify(settings, null, 2)}\n`, "utf8");
     return {
         exitCode: 0,
-        output: [`已更新项目级 Pi 配置：${settingsPath}`, `已加入 KCode package：${kcodePackage}`].join("\n"),
+        output: [`已更新项目级 Pi 配置：${settingsPath}`, `已保留当前 KCode package：${kcodePackage}`].join("\n"),
     };
 }
 export function doctor(cwd) {
@@ -107,6 +106,27 @@ function readSettings(path) {
 function normalizePath(path) {
     return resolve(path);
 }
+function isSameKcodePackage(candidate, currentPackage) {
+    const normalized = normalizePath(candidate);
+    if (normalized === currentPackage)
+        return true;
+    const candidateName = readPackageName(normalized) ?? packageNameFromPath(normalized);
+    return candidateName === packageName;
+}
+function readPackageName(packagePath) {
+    try {
+        const packageJson = JSON.parse(readFileSync(join(packagePath, "package.json"), "utf8"));
+        return packageJson.name;
+    }
+    catch {
+        return undefined;
+    }
+}
+function packageNameFromPath(path) {
+    const name = basename(path);
+    const scope = basename(dirname(path));
+    return scope.startsWith("@") ? `${scope}/${name}` : name;
+}
 function bundledPiCliPath() {
     const directPath = join(packageRoot, "node_modules", "@earendil-works", "pi-coding-agent", "dist", "cli.js");
     if (existsSync(directPath))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kcode-pi",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Kingdee-specific package and harness for Pi Coding Agent",
   "type": "module",
   "private": false,

package/src/cli/kcode.ts

@@ -1,5 +1,5 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
@@ -16,6 +16,7 @@ interface PiSettings {
 
 const packageRoot = dirname(dirname(dirname(fileURLToPath(import.meta.url))));
 const require = createRequire(import.meta.url);
+const packageName = readPackageName(packageRoot) ?? "kcode-pi";
 
 export interface PiCliCommand {
 	command: string;
@@ -47,11 +48,9 @@ export function initProject(cwd: string): KcodeCliResult {
 	const settingsPath = projectSettingsPath(cwd);
 	const settings = readSettings(settingsPath);
 	const kcodePackage = normalizePath(packageRoot);
-	const packages = settings.packages ?? [];
+	const packages = (settings.packages ?? []).filter((pkg) => !isSameKcodePackage(pkg, kcodePackage));
 
-	if (!packages.includes(kcodePackage)) {
-		packages.unshift(kcodePackage);
-	}
+	packages.unshift(kcodePackage);
 
 	settings.packages = packages;
 	mkdirSync(dirname(settingsPath), { recursive: true });
@@ -59,7 +58,7 @@ export function initProject(cwd: string): KcodeCliResult {
 
 	return {
 		exitCode: 0,
-		output: [`已更新项目级 Pi 配置：${settingsPath}`, `已加入 KCode package：${kcodePackage}`].join("\n"),
+		output: [`已更新项目级 Pi 配置：${settingsPath}`, `已保留当前 KCode package：${kcodePackage}`].join("\n"),
 	};
 }
 
@@ -146,6 +145,29 @@ function normalizePath(path: string): string {
 	return resolve(path);
 }
 
+function isSameKcodePackage(candidate: string, currentPackage: string): boolean {
+	const normalized = normalizePath(candidate);
+	if (normalized === currentPackage) return true;
+
+	const candidateName = readPackageName(normalized) ?? packageNameFromPath(normalized);
+	return candidateName === packageName;
+}
+
+function readPackageName(packagePath: string): string | undefined {
+	try {
+		const packageJson = JSON.parse(readFileSync(join(packagePath, "package.json"), "utf8")) as { name?: string };
+		return packageJson.name;
+	} catch {
+		return undefined;
+	}
+}
+
+function packageNameFromPath(path: string): string | undefined {
+	const name = basename(path);
+	const scope = basename(dirname(path));
+	return scope.startsWith("@") ? `${scope}/${name}` : name;
+}
+
 function bundledPiCliPath(): string | undefined {
 	const directPath = join(packageRoot, "node_modules", "@earendil-works", "pi-coding-agent", "dist", "cli.js");
 	if (existsSync(directPath)) return directPath;