groove-dev 0.27.49 → 0.27.51

package/packages/daemon/src/providers/groove-network.js

@@ -23,10 +23,53 @@ function getConfig() {
   return _daemonRef?.config?.networkBeta || null;
 }
 
+// Parse a version tag like 'v0.1.0' or '0.2.0-rc1' into [major, minor, patch].
+// Non-numeric suffixes are stripped. Returns null if unparseable.
+export function parseSemver(v) {
+  if (!v || typeof v !== 'string') return null;
+  const m = v.trim().replace(/^v/i, '').match(/^(\d+)\.(\d+)\.(\d+)/);
+  if (!m) return null;
+  return [parseInt(m[1], 10), parseInt(m[2], 10), parseInt(m[3], 10)];
+}
+
+// Returns negative / 0 / positive, like String.prototype.localeCompare.
+// Unparseable versions compare as "lower" than parseable ones.
+export function compareSemver(a, b) {
+  const pa = parseSemver(a);
+  const pb = parseSemver(b);
+  if (!pa && !pb) return 0;
+  if (!pa) return -1;
+  if (!pb) return 1;
+  for (let i = 0; i < 3; i++) {
+    if (pa[i] !== pb[i]) return pa[i] - pb[i];
+  }
+  return 0;
+}
+
+// v0.2.0+ renamed the `--relay` flag to `--signal`. Older installs still need
+// `--relay` until the user updates. Unparseable / missing versions are treated
+// as pre-0.2.0 to stay compatible with existing v0.1.0 installs.
+export function supportsSignalFlag(version) {
+  return compareSemver(version, '0.2.0') >= 0;
+}
+
+function signalFlagName() {
+  const cfg = getConfig() || {};
+  return supportsSignalFlag(cfg.version) ? '--signal' : '--relay';
+}
+
+// The Python client prepends the scheme itself — daemon passes a bare host
+// and adds `--tls` to request wss://. Strip any ws:// or wss:// a user may
+// have left in the stored signalUrl (e.g. from an older daemon default).
+function stripScheme(url) {
+  if (!url) return 'signal.groovedev.ai';
+  return url.replace(/^wss?:\/\//i, '').replace(/\/.*$/, '');
+}
+
 export class GrooveNetworkProvider extends Provider {
   static name = 'groove-network';
   static displayName = 'Groove Network';
-  static command = 'python3.12';
+  static command = 'python3';
   static authType = 'none';
 
   static models = [
@@ -44,7 +87,7 @@ export class GrooveNetworkProvider extends Provider {
 
   buildSpawnCommand(agent) {
     const cfg = getConfig() || {};
-    const relay = cfg.relayUrl || 'localhost:8770';
+    const signal = stripScheme(cfg.signalUrl);
     const model = agent.model || GrooveNetworkProvider.models[0].id;
     const maxTokens = agent.maxTokens || 500;
     const prompt = agent.prompt || '';
@@ -53,14 +96,16 @@ export class GrooveNetworkProvider extends Provider {
 
     const args = [
       '-m', 'src.consumer.client',
-      '--relay', relay,
+      signalFlagName(), signal,
+      '--tls',
       '--model', model,
       '--prompt', prompt,
       '--max-tokens', String(maxTokens),
+      '--json',
     ];
 
     return {
-      command: join(deployPath, 'venv', 'bin', 'python3.12'),
+      command: join(deployPath, 'venv', 'bin', 'python3'),
       args,
       env: { PYTHONUNBUFFERED: '1' },
       cwd: deployPath,
@@ -69,17 +114,19 @@ export class GrooveNetworkProvider extends Provider {
 
   buildHeadlessCommand(prompt, model) {
     const cfg = getConfig() || {};
-    const relay = cfg.relayUrl || 'localhost:8770';
+    const signal = stripScheme(cfg.signalUrl);
     const m = model || GrooveNetworkProvider.models[0].id;
     const deployPath = expandHome(cfg.deployPath) || resolve(homedir(), 'Desktop/groove-deploy');
     return {
-      command: join(deployPath, 'venv', 'bin', 'python3.12'),
+      command: join(deployPath, 'venv', 'bin', 'python3'),
       args: [
         '-m', 'src.consumer.client',
-        '--relay', relay,
+        signalFlagName(), signal,
+        '--tls',
         '--model', m,
         '--prompt', prompt,
         '--max-tokens', '500',
+        '--json',
       ],
       env: { PYTHONUNBUFFERED: '1' },
       cwd: deployPath,
@@ -105,6 +152,9 @@ export class GrooveNetworkProvider extends Provider {
           sessionId: msg.session_id,
           tokensGenerated: msg.tokens_generated,
           error: msg.error,
+          signal: msg.signal,
+          nodesAvailable: msg.nodes_available,
+          nodes: msg.nodes,
           raw: msg,
         };
       }