pi-freeflow 1.4.10 → 1.4.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-freeflow",
   "type": "module",
-  "version": "1.4.10",
+  "version": "1.4.11",
   "description": "Thin provider for OMP/Pi — model list + dumb relay proxy + log; host pi-ai owns thinking/normalization",
   "main": "extensions/index.ts",
   "types": "src/index.ts",

package/src/config.ts

@@ -15,6 +15,7 @@ export const OPENCODE_API_URL = `${UPSTREAM_OPENCODE}/v1`;
 
 // ── Network & Server defaults ───────────────────────────────────────
 export const DEFAULT_PORT = 28180;
+export const LEGACY_PORT = 18080;
 export const HOST = "127.0.0.1";
 export const DEFAULT_HOST = "127.0.0.1";
 

package/src/index.ts

@@ -17,7 +17,7 @@ import {
 	setAliveCatalog,
 } from "./catalog.ts";
 import { createCommandSpec, updateStatusBar } from "./commands.ts";
-import { DEFAULT_HOST, HOST, PORT } from "./config.ts";
+import { DEFAULT_HOST, HOST, LEGACY_PORT, PORT } from "./config.ts";
 import { log, logInfo, logWarn } from "./logger.ts";
 import { ALL_MODELS, KILO_MODEL_IDS, MODEL_MAP, getAllRegisteredModels, resolveCanonicalModelId } from "./models.ts";
 import { isProxyAlive, startProxy } from "./proxy.ts";
@@ -117,12 +117,20 @@ export default async function (pi: ExtensionAPI): Promise<void> {
 	let actualPort = PORT;
 
 	// 2. Single-Port Shared Pattern: Check if daemon is already running (e.g. parent session)
-	const alreadyRunning = await isProxyAlive(PORT);
+	// Dual-probe: probe current PORT first; if missing, check LEGACY_PORT so existing v1.4.9
+	// sessions on 18080 are seamlessly reused without split-brain or duplicate daemons.
+	let alreadyRunning = await isProxyAlive(PORT);
 	if (alreadyRunning) {
 		logInfo(
 			`Reusing existing pi-freeflow proxy daemon on http://${HOST}:${PORT}`,
 		);
 		actualPort = PORT;
+	} else if (PORT !== LEGACY_PORT && (await isProxyAlive(LEGACY_PORT))) {
+		logInfo(
+			`Reusing existing legacy pi-freeflow proxy daemon on http://${HOST}:${LEGACY_PORT}`,
+		);
+		alreadyRunning = true;
+		actualPort = LEGACY_PORT;
 	} else {
 		try {
 			const r = await startProxy();
@@ -161,6 +169,19 @@ export default async function (pi: ExtensionAPI): Promise<void> {
 		ensuringDaemon = true;
 		try {
 			if (await isProxyAlive(actualPort)) return;
+			// If actualPort died, check if another daemon is alive on PORT or LEGACY_PORT before binding
+			if (await isProxyAlive(PORT)) {
+				actualPort = PORT;
+				registerCatalog(getAliveCatalog());
+				logInfo(`Re-attached to proxy daemon on http://${HOST}:${PORT}`);
+				return;
+			}
+			if (PORT !== LEGACY_PORT && (await isProxyAlive(LEGACY_PORT))) {
+				actualPort = LEGACY_PORT;
+				registerCatalog(getAliveCatalog());
+				logInfo(`Re-attached to legacy proxy daemon on http://${HOST}:${LEGACY_PORT}`);
+				return;
+			}
 			const r = await startProxy();
 			if (r.server) server = r.server;
 			if (r.port) actualPort = r.port;